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/dtos/advertisement/ComOpsAdvDTO.java |   36 +++++++++++++++++++-----------------
 1 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvDTO.java
index f716a63..13a117d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvDTO.java
@@ -1,15 +1,17 @@
 package com.panzhihua.common.model.dtos.advertisement;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.panzhihua.common.validated.AddGroup;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
+import java.util.Date;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -25,26 +27,26 @@
     private Long id;
 
     @ApiModelProperty("广告位置id")
-    @NotNull(groups = {AddGroup.class},message = "广告位置不能为空")
-    @Min(value =1,groups = {AddGroup.class},message = "广告位置不能为空")
+    @NotNull(groups = {AddGroup.class}, message = "广告位置不能为空")
+    @Min(value = 1, groups = {AddGroup.class}, message = "广告位置不能为空")
     private Long posId;
 
     @ApiModelProperty("图片路径")
-    @NotBlank(groups = {AddGroup.class},message = "图片路径不能为空")
+    @NotBlank(groups = {AddGroup.class}, message = "图片路径不能为空")
     private String photoPath;
 
     @ApiModelProperty("链接类型:0~ 外部链接;1 ~ 内部链接")
-    @NotNull(groups = {AddGroup.class},message = "链接类型不能为空")
-    @Min(value =0,groups = {AddGroup.class},message = "链接类型不能为空")
+    @NotNull(groups = {AddGroup.class}, message = "链接类型不能为空")
+    @Min(value = 0, groups = {AddGroup.class}, message = "链接类型不能为空")
     private Integer linkType;
 
-    @ApiModelProperty(value = "上架时间",example = "2021-01-04 00:00:00")
-    @NotNull(groups = {AddGroup.class},message = "上架时间不能为空")
+    @ApiModelProperty(value = "上架时间", example = "2021-01-04 00:00:00")
+    @NotNull(groups = {AddGroup.class}, message = "上架时间不能为空")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date onAt;
 
-    @ApiModelProperty(value = "下架时间",example = "2024-01-04 00:00:00")
-    @NotNull(groups = {AddGroup.class},message = "下架时间不能为空")
+    @ApiModelProperty(value = "下架时间", example = "2024-01-04 00:00:00")
+    @NotNull(groups = {AddGroup.class}, message = "下架时间不能为空")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date offAt;
 
@@ -54,9 +56,9 @@
     @ApiModelProperty("跳转url地址")
     private String jumpUrl;
 
-    @ApiModelProperty(value = "create_at",hidden = true)
+    @ApiModelProperty(value = "create_at", hidden = true)
     private Date createAt;
 
-    @ApiModelProperty(value = "update_at",hidden = true)
+    @ApiModelProperty(value = "update_at", hidden = true)
     private Date updateAt;
 }

--
Gitblit v1.7.1