From a1acacfb8cfa4b0e2fc07fbf214f4f9b47636c98 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 15 三月 2024 18:44:10 +0800
Subject: [PATCH] Merge branch 'fhx-prod-FDD' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceDto.java |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceDto.java b/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceDto.java
index 3aab9ff..d8eb62d 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceDto.java
@@ -10,16 +10,40 @@
 @Data
 public class AppearanceDto{
 
+    /**椤垫暟*/
+    private Integer pageNum = 1;
+    /**鏉℃暟*/
+    private Integer pageSize = 20;
+
+    /**鏃堕棿娈靛紑濮� yyyy-MM-dd HH:mm:ss*/
+    private String startTime;
+     /**鏃堕棿娈电粨鏉� yyyy-MM-dd HH:mm:ss*/
+    private String endTime;
+
+    /**鏁版嵁id*/
+    private String id;
     /**鐢ㄦ埛Id*/
     private String userId;
     /**鏄惁鏂扮増棰滃�艰鍒�*/
-    private Integer isNewVersion = NO;
+    private Integer isNewVersion = YES;
     /**鍛樺伐id*/
     private String employeeId;
     /**棰滃�艰鍒欐爣绛惧垪琛�*/
     List<AppearanceLabelDto> labelDtoList;
     /**棰滃�艰鍒欏浘鐗囧垪琛�*/
     List<AppearancePictureDto> pictureDtoList;
+    /** 鍒拌璁㈠崟id(闂ㄥ簵鍔╂墜浣跨敤缁熻浣跨敤) */
+    private String visitOrderId;
+
+    /**鏁版嵁绫诲瀷(AppearanceConstants)*/
+    private Integer dataType;
+
+    /** 鐭湡瑙勫垝 */
+    private String shortPlan;
+    /** 涓湡瑙勫垝 */
+    private String middlePlan;
+    /** 闀挎湡瑙勫垝 */
+    private String longPlan;
 
     public AppearanceDto() {
     }

--
Gitblit v1.8.0