From cb7bf61ddec695b25f8fe509815c5e5794180b0f Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 17 七月 2024 17:14:53 +0800
Subject: [PATCH] Merge branch 'master-base' into master-fwq-爆款活动2.0

---
 phis-feign/src/main/java/com/hz/his/dto/project/ProjectWarnRecordDto.java |    6 ++++++
 1 files changed, 6 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..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;
     // 鍏叡鍚嶇О
@@ -21,6 +25,8 @@
     private String parentCommonId;
     // 涓婄骇鍏叡鍚嶇О
     private String parentCommonName;
+    // 椋庨櫓娴佸け绛夌骇
+    private String lossDevel;
     // 寮�濮嬫棩鏈�
     private Date startTime;
     // 缁撴潫鏃ユ湡

--
Gitblit v1.8.0