From 155905061b3aa29d2aa23e5693e8704debfb9828 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 06 十一月 2023 16:36:06 +0800
Subject: [PATCH] Merge branch 'master' 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