From 55dc3707715ed7213163f4c8a0bf79c6a6f4dc63 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 21 六月 2023 14:27:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceDto.java | 11 ++++++++++-
1 files changed, 10 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 d3b0ee8..8eb208c 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
@@ -15,16 +15,25 @@
/**鏉℃暟*/
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;
public AppearanceDto() {
}
--
Gitblit v1.8.0