From 566a0871ca258e2ed8e8028b6d0e0d657d065c64 Mon Sep 17 00:00:00 2001 From: fhx <308050795@qq.com> Date: 星期五, 02 六月 2023 18:13:05 +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 | 9 ++++++++- 1 files changed, 8 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..8f954ae 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,10 +15,17 @@ /**鏉℃暟*/ 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; /**棰滃�艰鍒欐爣绛惧垪琛�*/ -- Gitblit v1.8.0