From 3331e358f12dd29b15eb94e6f57d0d11ccd8182c Mon Sep 17 00:00:00 2001 From: zhangxu <3%usVi4iXbVkhI1c> Date: 星期五, 23 九月 2022 10:06:50 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- phis-feign/src/main/java/com/hz/his/dto/activity/ActivityDto.java | 23 +++++++++++++++++++++++ 1 files changed, 23 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 bda847d..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 @@ -12,5 +14,26 @@ public class ActivityDto extends PageDto { /**闂ㄥ簵鏍囪瘑 */ private String shopId; + /**鍥㈣喘鍟嗗搧绫诲瀷鏍囪瘑 */ + 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