From e74dade001072c3a0e93cd6d698df4df2262f5a3 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 01 八月 2024 22:30:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-test

---
 phis-feign/src/main/java/com/hz/his/vo/compare/CompareListVo.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/vo/compare/CompareListVo.java b/phis-feign/src/main/java/com/hz/his/vo/compare/CompareListVo.java
index 2ec5658..be7c7d5 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/compare/CompareListVo.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/compare/CompareListVo.java
@@ -12,6 +12,8 @@
     private Integer pageNum;
     /**褰撳墠椤垫樉绀烘潯鏁�*/
     private Integer pageSize;
+    /**鍏抽敭瀛�*/
+    private String keyWord;
 
     /**瀵规瘮鐓ф爣璇�*/
     private String id;
@@ -24,8 +26,6 @@
 
     /**鐢ㄦ埛闋呯洰鏍囪瘑*/
     private String userProjectItemId;
-
-
 
     public Integer getPageNum() {
         if(pageNum == null){

--
Gitblit v1.8.0