Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
This commit is contained in:
commit
919367162b
@ -2,7 +2,6 @@ package cn.lili.modules.permission.entity.vo;
|
||||
|
||||
import cn.lili.common.utils.ObjectUtil;
|
||||
import cn.lili.elasticsearch.EsSuffix;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
@ -40,9 +39,8 @@ public class SystemLogVO implements Serializable {
|
||||
|
||||
|
||||
@ApiModelProperty(value = "日志记录时间")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Field(type = FieldType.Date, fielddata = true)
|
||||
private Date createTime = new Date();
|
||||
@Field(type = FieldType.Long)
|
||||
private Long createTime = new Date().getTime();
|
||||
|
||||
@ApiModelProperty(value = "请求用户")
|
||||
@Field(type = FieldType.Text)
|
||||
|
Loading…
x
Reference in New Issue
Block a user