From 17457a80779db37013ef004d2aa232c859838b8d Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 11 四月 2024 17:25:03 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-fwq-颜值规划4.0

---
 phis-feign/src/main/java/com/hz/his/dto/activity/ActivityDto.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/activity/ActivityDto.java b/phis-feign/src/main/java/com/hz/his/dto/activity/ActivityDto.java
index 48c1ea5..73909d5 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/activity/ActivityDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/activity/ActivityDto.java
@@ -4,6 +4,8 @@
 import com.hz.his.dto.PageDto;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * 娲诲姩瑙勫垯鍙戦�佸弬鏁�
  * @author wrh
@@ -16,6 +18,22 @@
     private String goodsTypeId;
     /**鍥㈣喘娲诲姩鏍囪瘑 */
     private String groupBuyId;
+    //appid
+    private String appId;
+    private String id;
+    private String userId;
+    private BigDecimal ordersTotal;
+
+    /**鐘舵��(娲诲姩瑙勫垯)*/
+    private String status;
+    /**閲戦寮�濮嬪尯闂�*/
+    private String startTotal;
+    /**閲戦缁撴潫鍖洪棿*/
+    private String endTotal;
+    /**鏈夋晥寮�濮�*/
+    private String startTime;
+    /**鏈夋晥缁撴潫鏃堕棿*/
+    private String endTime;
 
 
 }

--
Gitblit v1.8.0