From ce0dc32dcecbe1cf19d63c7bed1a87a90191f2ed Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期一, 26 八月 2024 14:47:31 +0800
Subject: [PATCH] Merge branch 'fhx-base-治疗单改版0729' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java | 15 +++++++++++++++
1 files changed, 15 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..cebc30a 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,15 @@
private String marketActivityId;
/** 钀ラ攢娲诲姩鍏宠仈浼樻儬鍒竔d */
private String activityCouponId;
+ /** 钀ラ攢娲诲姩鍒嗙粍id */
+ private String groupId;
+ /** 钀ラ攢娲诲姩棰嗗彇璁板綍瀛愰」itemid */
+ private String recordItemId;
+ /**瀹℃牳鐘舵�� 鏌ヨ 0=鏃犻渶瀹℃壒 1=寰呭鎵� 2=瀹℃壒鎴愬姛 3=瀹℃壒澶辫触*/
+ private Integer approvalStatus;
+ /**瀹℃壒鐘舵�� 閫氳繃=agree 鎷掔粷=reject*/
+ private String statusStr;
+
/** 骞冲彴绫诲瀷(PlatformConstants) */
private String platformType;
@@ -63,5 +75,8 @@
/** 鎿嶄綔浜鸿鑹瞚d(EmployeeRole) */
private String opRoleId;
+ /**瀹℃壒澶囨敞*/
+ private String remark;
+
}
--
Gitblit v1.8.0