From fdbc5fc46539eef88f612a397ec18f42175616bd Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期四, 27 四月 2023 16:42:08 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 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 2c3dac3..2f285f0 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,6 +11,8 @@
     private Integer pageNum;
     // 姣忛〉鏁伴噺
     private Integer pageSize;
+    // 椤鹃棶id
+    private String employeeId;
     // 鐢ㄦ埛id
     private String userId;
     // 鍏叡鏍囪瘑
@@ -21,6 +23,8 @@
     private String parentCommonId;
     // 涓婄骇鍏叡鍚嶇О
     private String parentCommonName;
+    // 椋庨櫓娴佸け绛夌骇
+    private String lossDevel;
     // 寮�濮嬫棩鏈�
     private Date startTime;
     // 缁撴潫鏃ユ湡

--
Gitblit v1.8.0