Merge remote-tracking branch 'origin/master'
commit
e45e8e40d3
|
|
@ -1,6 +1,7 @@
|
||||||
package com.zcloud.primeport.dto.clientobject;
|
package com.zcloud.primeport.dto.clientobject;
|
||||||
|
|
||||||
import com.alibaba.cola.dto.ClientObject;
|
import com.alibaba.cola.dto.ClientObject;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
|
|
@ -105,9 +106,11 @@ public class DaHuaAccessRecordCO extends ClientObject {
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
@ApiModelProperty(value = "进出时间")
|
@ApiModelProperty(value = "进出时间")
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
private LocalDateTime swingTime;
|
private LocalDateTime swingTime;
|
||||||
|
|
||||||
@ApiModelProperty(value = "大华平台入库时间")
|
@ApiModelProperty(value = "大华平台入库时间")
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
private LocalDateTime dahuaCreateTime;
|
private LocalDateTime dahuaCreateTime;
|
||||||
|
|
||||||
@ApiModelProperty(value = "口罩状态")
|
@ApiModelProperty(value = "口罩状态")
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue