From 97d7e38d0d0dc419672f9a6dbb12ac0e7f145553 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期二, 24 十月 2023 17:55:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rx-1023-营销优惠券新版' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/project/ProjectWarnRecordDto.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/project/ProjectWarnRecordDto.java b/phis-feign/src/main/java/com/hz/his/dto/project/ProjectWarnRecordDto.java
index 2f285f0..578529f 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/project/ProjectWarnRecordDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/project/ProjectWarnRecordDto.java
@@ -15,6 +15,8 @@
     private String employeeId;
     // 鐢ㄦ埛id
     private String userId;
+    // 鍏叡绫诲瀷
+    private String commonType;
     // 鍏叡鏍囪瘑
     private String commonId;
     // 鍏叡鍚嶇О

--
Gitblit v1.8.0