From c0ad40fda3f99662380409c426eaecf16153096c Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 09 四月 2024 11:06:41 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java | 10 ++++++++++
1 files changed, 10 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 00f9493..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
@@ -56,6 +56,13 @@
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;
@@ -68,5 +75,8 @@
/** 鎿嶄綔浜鸿鑹瞚d(EmployeeRole) */
private String opRoleId;
+ /**瀹℃壒澶囨敞*/
+ private String remark;
+
}
--
Gitblit v1.8.0