From f84d9e69907cb678150eaa6393fd74cf042fcca4 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:39:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcShiftSub.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcShiftSub.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcShiftSub.java
index dafb565..50f29e5 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcShiftSub.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcShiftSub.java
@@ -50,24 +50,32 @@
/**
* 寮�濮嬫椂闂�
*/
+ @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
+ @DateTimeFormat(pattern="HH:mm:ss")
@ApiModelProperty("寮�濮嬫椂闂�")
private String startDate;
/**
* 缁撴潫鏃堕棿
*/
+ @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
+ @DateTimeFormat(pattern="HH:mm:ss")
@ApiModelProperty("缁撴潫鏃堕棿")
private String endDate;
/**
* 寮�濮嬩紤鎭椂闂�
*/
+ @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
+ @DateTimeFormat(pattern="HH:mm:ss")
@ApiModelProperty("寮�濮嬩紤鎭椂闂�")
private String sleepStartDate;
/**
* 缁撴潫浼戞伅鏃堕棿
*/
+ @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
+ @DateTimeFormat(pattern="HH:mm:ss")
@ApiModelProperty("缁撴潫浼戞伅鏃堕棿")
private String sleepEndDate;
--
Gitblit v1.9.3