Merge branch 'master' of http://47.115.223.229:8888/yangjun/hldy_java_monomer
This commit is contained in:
commit
2d113730e3
|
|
@ -297,8 +297,8 @@ public class ElderInfoMQDto implements Serializable {
|
|||
/**
|
||||
* 长者入住时间
|
||||
*/
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date checkinTime;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -291,8 +291,8 @@ public class ElderInfoEntity implements Serializable {
|
|||
/**
|
||||
* 长者入住时间
|
||||
*/
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date checkinTime;
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -365,8 +365,8 @@ public class ElderInfo implements Serializable {
|
|||
/**
|
||||
* 长者入住时间
|
||||
*/
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date checkinTime;
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue