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/community/bigscreen/BigScreenStatisticPartyActivityDTO.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/BigScreenStatisticPartyActivityDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/BigScreenStatisticPartyActivityDTO.java
index b2ba8a1..ce9f1fa 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/BigScreenStatisticPartyActivityDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/BigScreenStatisticPartyActivityDTO.java
@@ -1,10 +1,10 @@
package com.panzhihua.common.model.dtos.community.bigscreen;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
/**
* @ClasssName PageBigScreenStatisticPartyOrg
@@ -17,7 +17,7 @@
public class BigScreenStatisticPartyActivityDTO {
@ApiModelProperty(value = "社区id", hidden = true, example = "2", required = false)
- //@NotNull(message = "社区id不能为空")
+ // @NotNull(message = "社区id不能为空")
private Long communityId;
@ApiModelProperty(value = "类型：3 按月 2.按周;默认为3", hidden = false, example = "3", required = false)
@@ -25,7 +25,7 @@
private Integer type = 3;
@ApiModelProperty(value = "日期", hidden = false, example = "2021-06-01", required = true)
-// @NotNull(message = "时间不能为空")
+ // @NotNull(message = "时间不能为空")
@Pattern(regexp = "^\\d{4}-\\d{2}-\\d{2}$", message = "时间格式错误")
private String date;
@@ -36,6 +36,5 @@
@ApiModelProperty(value = "结束时间", hidden = false, example = "2021-06-01")
@Pattern(regexp = "^\\d{4}-\\d{2}-\\d{2}$", message = "时间格式错误")
private String endTime;
-
}
--
Gitblit v1.7.1