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

---
 phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInsertVo.java |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInsertVo.java b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInsertVo.java
index dd0489a..e49988e 100644
--- a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInsertVo.java
+++ b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordInsertVo.java
@@ -23,8 +23,6 @@
     private String returnVisitType;
     /*** 鍥炶鏂瑰紡 **/
     private String returnVisitMethod;
-    /*** 鍥炶缁撴灉**/
-    private Integer visitResultStatus;
     /*** 闂ㄥ簵**/
     private String shopId;
     /*** 鍛樺伐id **/
@@ -53,6 +51,23 @@
     /** 鍒犻櫎鐨勫洖璁�*/
     private Set<String> deleteIdList;
 
+    //-----鍥炶缁撴瀯鍙傛暟
+    /**鍥炶鐘舵��*/
+    private Integer returnVisitStatus;
+    /*** 鍥炶缁撴灉**/
+    private Integer visitResultStatus;
+    /*** 鍥炶鏄惁婊℃剰**/
+    private Integer satisfiedStatus;
+    /**瀹屾垚鐘舵�� 0鏈畬鎴� 1宸插畬鎴� 2宸插彇娑�*/
+    private Integer doneStatus;
+    /**鍥炶鏃堕棿*/
+    private Date returnVisitTime;
+    /**瀹屾垚鏃堕棿*/
+    private Date doneTime;
+    /**鍥炶鎯呭喌锛堝憳宸ュ洖璁挎椂鍊欏~鍐欙級*/
+    private String situation;
+
+
     /*********************************************/
 
     /*** 鎵归噺鎿嶄綔ID**/

--
Gitblit v1.8.0