From 0f1fe99d726e175fa4c5a74e7f8f7b004c93e3a2 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 19 九月 2023 10:09:14 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java | 3 +++
1 files changed, 3 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..c3cba43 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锛堥�楀彿鍒嗗壊锛� */
--
Gitblit v1.8.0