From 4607163342d0f3598748662eb3e41cacb708adc6 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期二, 28 二月 2023 11:45:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/activity/ActivityDto.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 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 ce3d55d..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
@@ -13,9 +15,25 @@
/**闂ㄥ簵鏍囪瘑 */
private String shopId;
/**鍥㈣喘鍟嗗搧绫诲瀷鏍囪瘑 */
- private String typeId;
+ 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