From 67926388d2b3b96f6360af6d70fdc56596b6b39d Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期日, 28 四月 2024 16:31:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-fwq-积分抵扣现金' into master-fwq-积分抵扣现金

---
 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