From 85d1dc328bd46089b63b57bd356908cbba26e29c Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 23 十月 2023 16:45:19 +0800
Subject: [PATCH] Merge branch 'master' 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