From e74dade001072c3a0e93cd6d698df4df2262f5a3 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 01 八月 2024 22:30:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' 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 c1cf692..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
@@ -75,5 +75,8 @@
     /** 鎿嶄綔浜鸿鑹瞚d(EmployeeRole) */
     private String opRoleId;
 
+    /**瀹℃壒澶囨敞*/
+    private String remark;
+
 
 }

--
Gitblit v1.8.0