From 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 30 九月 2024 18:47:53 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan

---
 phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java |   12 ++++++++++++
 1 files changed, 12 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 c3cba43..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
@@ -54,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;
@@ -66,5 +75,8 @@
     /** 鎿嶄綔浜鸿鑹瞚d(EmployeeRole) */
     private String opRoleId;
 
+    /**瀹℃壒澶囨敞*/
+    private String remark;
+
 
 }

--
Gitblit v1.8.0