From eda58e0e6d4abdd2b060e28867d103045845aa69 Mon Sep 17 00:00:00 2001 From: 罗元桥 <2376770955@qq.com> Date: 星期一, 30 八月 2021 13:13:18 +0800 Subject: [PATCH] Merge branch 'test' into 'yuyue_dev' --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventApplicationUserNoticeVO.java | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventApplicationUserNoticeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventApplicationUserNoticeVO.java index 92e559b..f8a7a0d 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventApplicationUserNoticeVO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventApplicationUserNoticeVO.java @@ -1,11 +1,12 @@ package com.panzhihua.common.model.vos.grid; -import java.util.*; +import java.util.Date; + +import com.fasterxml.jackson.annotation.JsonFormat; + import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - -import com.fasterxml.jackson.annotation.JsonFormat; /** * @@ -13,32 +14,31 @@ * @version 1.0 * @since 1.0 * @date 2021-05-26 - * */ + */ @Data @ApiModel("用户协议和隐私政策信息返回参数") public class EventApplicationUserNoticeVO { @ApiModelProperty(value = "id") - private Long id; + private Long id; @ApiModelProperty(value = "应用ID") - private Integer productId; + private Integer productId; @ApiModelProperty(value = "应用名称") - private String productName; + private String productName; @ApiModelProperty(value = "通知行为(1、强制通知必须手段确定2、提示更新,自动消退)") - private Integer action; + private Integer action; @ApiModelProperty(value = "内容") - private String content; + private String content; @ApiModelProperty(value = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createAt; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createAt; @ApiModelProperty(value = "创建人") - private Long createBy; - + private Long createBy; } -- Gitblit v1.7.1