From a9f950c0d11a687a7a940443b8c765f6d87ae4f1 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 00:26:22 +0800
Subject: [PATCH] 合并新的修改
---
zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderItem.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderItem.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderItem.java
index 7456a8e..acd3b19 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderItem.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderItem.java
@@ -33,6 +33,11 @@
private Integer count;
+ /**
+ * 退款数量
+ */
+ private Integer refundCount;
+
/**
* 是否为赠送和 是否
@@ -87,10 +92,6 @@
* 欠款金额
*/
private Double arrears;
-
-
-
-
/**
@@ -109,8 +110,7 @@
*/
private Long cardId;
-
-
+
/**
* 是否为综合卡创建的订单明细
* 1是
@@ -160,6 +160,14 @@
return preCount;
}
+ public Integer getRefundCount() {
+ return refundCount;
+ }
+
+ public void setRefundCount(Integer refundCount) {
+ this.refundCount = refundCount;
+ }
+
public void setPreCount(int preCount) {
this.preCount = preCount;
}
--
Gitblit v1.9.1