|
@@ -78,22 +78,22 @@ public class UserSalaryManage {
|
|
|
/**
|
|
|
* 上午开始工作时间
|
|
|
*/
|
|
|
- @JsonFormat(timezone = "GMT+8", pattern = "HH:mm:ss")
|
|
|
+ @JsonFormat(timezone = "GMT+8", pattern = "HH:mm")
|
|
|
private Date morningBeginTime;
|
|
|
/**
|
|
|
* 上午结束工作时间
|
|
|
*/
|
|
|
- @JsonFormat(timezone = "GMT+8", pattern = "HH:mm:ss")
|
|
|
+ @JsonFormat(timezone = "GMT+8", pattern = "HH:mm")
|
|
|
private Date morningEndTime;
|
|
|
/**
|
|
|
* 下午开始工作时间
|
|
|
*/
|
|
|
- @JsonFormat(timezone = "GMT+8", pattern = "HH:mm:ss")
|
|
|
+ @JsonFormat(timezone = "GMT+8", pattern = "HH:mm")
|
|
|
private Date afternoonBeginTime;
|
|
|
/**
|
|
|
* 下午结束工作时间
|
|
|
*/
|
|
|
- @JsonFormat(timezone = "GMT+8", pattern = "HH:mm:ss")
|
|
|
+ @JsonFormat(timezone = "GMT+8", pattern = "HH:mm")
|
|
|
private Date afternoonEndTime;
|
|
|
/**
|
|
|
* 薪资结算方式
|