From 4e15e6c80538b3db7bc3262a77ffc4694b968067 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 15 七月 2024 11:40:38 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityReturnVo.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityReturnVo.java b/phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityReturnVo.java
index 191f9ec..0b3377a 100644
--- a/phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityReturnVo.java
+++ b/phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityReturnVo.java
@@ -13,12 +13,15 @@
private Integer isExecute = 0;
/**鏄惁宸蹭笅鍗�*/
private Integer isOrder = 0;
-
- /**杩旇禒鐨勫鍊奸噾*/
+ /**澧炲�奸噾*/
private BigDecimal incrementMoney = BigDecimal.ZERO;
- /**杩旇禒鐨勭Н鍒�*/
+ /**绉垎*/
private BigDecimal integralMoney = BigDecimal.ZERO;
+ /**浼樻儬鍒告暟閲�*/
+ private Integer couponNum = 0;
/**閭�璇风殑浜烘暟*/
private Integer inviteeNum = 0;
+ /**鍒嗕韩鐨勪汉鏁�*/
+ private Integer shareNum = 0;
}
--
Gitblit v1.8.0