From d61bfb2a1295dc1d1d4f3ab81845f4e8103a8969 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期五, 13 九月 2024 19:56:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjh-basefun-回访重构' into master-jiayan-test

---
 phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordFindVo.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 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 0d477ed..62697f8 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
@@ -54,6 +54,8 @@
 
     /***鍥炶鍛樺伐 - List**/
     private List<String> employeeIdList;
+    /**鎼滅储闂ㄥ簵*/
+    private List<String> searchShopIdList;
 
     /**鍒涘缓绫诲瀷*/
     private Integer createPersonType;
@@ -63,13 +65,13 @@
     private String createPersonId;
     /*** 鏉ユ簮娓犻亾鏌ヨ**/
     private String channelType;
-
-    //---棰濆鐨勫弬鏁�
-    /*** 璁″垝鏃堕棿**/
-    private Date planTime;
     /*** 鍥炶鍛樺伐鏍囪瘑锛堟煡璇級 **/
     private String corpId;
 
+    //---棰濆鐨勫弬鏁帮紝鍒嗙粍鏃跺�欑敤鍒�
+    /*** 璁″垝鏃堕棿**/
+    private Date planTime;
+
     //-----鏉冮檺-寮�濮�
     /**鏉冮檺-鏌ョ湅鏉冮檺锛岃缃繖涓笉鍒ゆ柇浠讳綍鐨勯檺鍒舵潯浠�*/
     private Integer seeRoleType = SEE_ROLE_TYPE_CONVENTION;

--
Gitblit v1.8.0