From 2a72c5fc5cc09fe98abe21e9cedd01142b0f17c7 Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期三, 22 十一月 2023 15:30:29 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test --- phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java index e32e640..00f9493 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java @@ -39,6 +39,9 @@ /** 鏄惁娑堣垂 */ private Integer isConsume; + /** 鍏宠仈椤圭洰绫诲瀷 */ + private String commonType; + //------------------- /** 澶氶棬搴梚d锛堥�楀彿鍒嗗壊锛� */ @@ -51,6 +54,8 @@ private String marketActivityId; /** 钀ラ攢娲诲姩鍏宠仈浼樻儬鍒竔d */ private String activityCouponId; + /** 钀ラ攢娲诲姩鍒嗙粍id */ + private String groupId; /** 骞冲彴绫诲瀷(PlatformConstants) */ private String platformType; -- Gitblit v1.8.0