From 2de1eaf04c7a045173bedf3305a91e6d551d16a5 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期二, 28 五月 2024 18:14:09 +0800
Subject: [PATCH] Merge branch 'chenjiahe-新版回访' into master-test

---
 phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordFindVo.java |   52 ++++++++++++++++++++++------------------------------
 1 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordFindVo.java b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordFindVo.java
index a4ad989..5d8a95c 100644
--- a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordFindVo.java
+++ b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordFindVo.java
@@ -26,55 +26,34 @@
     /*** 瓒呮椂鐘舵��**/
     private Integer timeoutStatus;
 
-    //---棰濆鐨勫弬鏁�
-    /*** 璁″垝鏃堕棿**/
-    private Date planTime;
-    /***鍛樺伐ID - List**/
-    private List<String> employeeIds;
-
-    /*** 鍗曚釜鍛樺伐ID **/
-    private String employeeId;
-    /***瑙掕壊ID **/
-    private String roleId;
-
-    /*** 鍏抽敭瀛楁悳绱� **/
-    private String keyWord;
-
-    /*** 鍒涘缓鏃堕棿**/
+    /*** 鍒涘缓鏃堕棿-寮�濮�**/
     private Date startTime;
+    /*** 鍒涘缓鏃堕棿-缁撴潫**/
     private Date endTime;
 
-    /*** 鍥炶鏃堕棿**/
+    /*** 鍥炶鏃堕棿-寮�濮�**/
     private Date returnVisitStartTime;
+    /*** 鍥炶鏃堕棿-缁撴潫**/
     private Date returnVisitEndTime;
 
-    /*** 瀹屾垚鏃堕棿**/
+    /*** 瀹屾垚鏃堕棿-寮�濮�**/
     private Date doneStartTime;
+    /*** 瀹屾垚鏃堕棿-缁撴潫**/
     private Date doneEndTime;
 
     /*** 鍥炶绫诲瀷 **/
     private String returnVisitType;
-    /*** 鍥炶璁″垝**/
-    private String returnVisitPlan;
     /*** 鍥炶鏂瑰紡 **/
     private String returnVisitMethod;
     /*** 鍥炶缁撴灉**/
     private Integer visitResultStatus;
-
     /*** 鍥炶鏄惁婊℃剰**/
     private Integer satisfiedStatus;
 
     /**鎵�灞為棬搴�*/
-    private String shopId;
-    /*** 鍗曚釜闂ㄥ簵 **/
-    private String shopIds;
-    /*** 闂ㄥ簵idList鍒楄〃**/
-    private List<String> authShopList;
-
-    /*** 鍛樺伐id **/
-    private String corpId;
-    /*** 鍛樺伐鍚嶇О **/
-    private String corpName;
+    private List<String> shopIdList;
+    /***鍥炶鍛樺伐 - List**/
+    private List<String> employeeIdList;
 
     /*** 鍒涘缓浜�**/
     private String createPersonName;
@@ -83,4 +62,17 @@
     /*** 鏉ユ簮娓犻亾鏌ヨ**/
     private String channelType;
 
+    //---棰濆鐨勫弬鏁�
+    /*** 璁″垝鏃堕棿**/
+    private Date planTime;
+    /*** 鍥炶鍛樺伐鏍囪瘑 **/
+    private String corpId;
+
+    //---鑷畾涔夊垎椤碉紝璧拌繖涓病鏈夊垎椤垫ā寮�
+    /**椤垫暟*/
+    private Integer customPageNum;
+    /**鏉℃暟*/
+    private Integer customPageSize;
+
+
 }
\ No newline at end of file

--
Gitblit v1.8.0