From 37993b3cf3243e6ffdacab526b04dd2284565a42 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 25 七月 2024 18:59:31 +0800
Subject: [PATCH] Merge branch 'master-base' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/dto/project/ProjectWarnRecordDto.java |    4 ++++
 1 files changed, 4 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 7e7ec05..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
@@ -11,8 +11,12 @@
     private Integer pageNum;
     // 姣忛〉鏁伴噺
     private Integer pageSize;
+    // 椤鹃棶id
+    private String employeeId;
     // 鐢ㄦ埛id
     private String userId;
+    // 鍏叡绫诲瀷
+    private String commonType;
     // 鍏叡鏍囪瘑
     private String commonId;
     // 鍏叡鍚嶇О

--
Gitblit v1.8.0