From fdb089cb8bee6099efcbd7b0ca2672c63cbb6784 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 11 十一月 2019 09:33:56 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/entity/shop/BanLiShopOrder.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/shop/BanLiShopOrder.java b/fanli/src/main/java/com/yeshi/fanli/entity/shop/BanLiShopOrder.java
index 84bbefb..d5d0398 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/shop/BanLiShopOrder.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/shop/BanLiShopOrder.java
@@ -30,6 +30,14 @@
public final static int STATE_REJECT_REFUND_FAIL = 15;// 瀹℃牳鎷掔粷-閫�娆惧け璐�
public final static int STATE_SUCCESS = 20;// 浜ゆ槗鎴愬姛
+ public BanLiShopOrder(Long id) {
+ super();
+ this.id = id;
+ }
+
+ public BanLiShopOrder() {
+ }
+
@Column(name = "so_id")
private Long id;
@Column(name = "so_uid")
@@ -76,7 +84,6 @@
private Date updateTime;// 鏇存柊鏃堕棿
@Column(name = "so_order_goods_id")
private BanLiShopOrderGoods orderGoods;
-
public BanLiShopOrderGoods getOrderGoods() {
return orderGoods;
--
Gitblit v1.8.0