From bef0ef19d792a16a31a59ec7beafc7b0885529fa Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 06 十一月 2019 15:36:31 +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 | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 98eec27..84bbefb 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
@@ -44,13 +44,13 @@
private BigDecimal hongBaoPayment;// 绾㈠寘鏀粯閲戦
@Column(name = "so_payment_hongbao_state")
private Integer hongBaoPaymentState;// 鏀粯閲戦鐘舵��
- @Column(name = "so_payment_money")
- private BigDecimal balancePayment;// 浣欓鏀粯閲戦
- @Column(name = "so_payment_money_state")
- private Integer balancePaymentState;// 浣欓閲戦鐘舵��
@Column(name = "so_payment_balance")
- private BigDecimal moneyPayment;// 鐜伴噾鏀粯閲戦
+ private BigDecimal balancePayment;// 浣欓鏀粯閲戦
@Column(name = "so_payment_balance_state")
+ private Integer balancePaymentState;// 浣欓閲戦鐘舵��
+ @Column(name = "so_payment_money")
+ private BigDecimal moneyPayment;// 鐜伴噾鏀粯閲戦
+ @Column(name = "so_payment_money_state")
private Integer moneyPaymentState;// 鐜伴噾閲戦鐘舵��
@Column(name = "so_pay_time")
private Date payTime;// 璁㈠崟鏀粯鏃堕棿
@@ -64,7 +64,6 @@
private String stateDesc;// 鐘舵�佺畝浠�
@Column(name = "so_charge_account_type")
private ChargeTypeEnum chargeAccountType;// 鍏呭�艰处鍙风被鍨�
-
@Column(name = "so_charge_account")
private String chargeAccount;// 鍏呭�艰处鍙�
@Column(name = "so_charge_account2")
@@ -78,6 +77,7 @@
@Column(name = "so_order_goods_id")
private BanLiShopOrderGoods orderGoods;
+
public BanLiShopOrderGoods getOrderGoods() {
return orderGoods;
}
--
Gitblit v1.8.0