From 83c7cfa4ecd5d59106b09efff26be43141e38386 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 21 十二月 2023 09:10:50 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/UserListRequest.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/UserListRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/UserListRequest.java index 059b2c3..65345d2 100644 --- a/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/UserListRequest.java +++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/UserListRequest.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * 鍒嗙被淇℃伅琛� * @author 姹熻箘韫� @@ -21,7 +23,7 @@ @ApiModelProperty(value = "韬唤璇佸彿" ) private String idNo; @ApiModelProperty(value = "鏃堕棿鑼冨洿-寮�濮嬶紝鏍煎紡yyyy-MM-dd HH:mm:ss锛屽2023-11-24 09:17:11" ) - private String startTime ; + private Date startTime ; @ApiModelProperty(value = "鏃堕棿鑼冨洿-鎴锛屾牸寮弝yyy-MM-dd HH:mm:ss锛屽2023-11-24 09:17:11" ) - private String endTime ; + private Date endTime ; } -- Gitblit v1.9.3