From 0dc0a47cf5f655cb0dbff082f7c36613c21e328b Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 12 七月 2021 18:30:01 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/BigScreenStatisticPartyActivityDTO.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 49fd951..b2ba8a1 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
@@ -20,14 +20,22 @@
//@NotNull(message = "社区id不能为空")
private Long communityId;
- @ApiModelProperty(value = "类型：3 按月;默认为3", hidden = false, example = "3", required = false)
+ @ApiModelProperty(value = "类型：3 按月 2.按周;默认为3", hidden = false, example = "3", required = false)
@NotNull(message = "类型不能为空")
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;
+ @ApiModelProperty(value = "开始时间", hidden = false, example = "2021-06-01")
+ @Pattern(regexp = "^\\d{4}-\\d{2}-\\d{2}$", message = "时间格式错误")
+ private String startTime;
+
+ @ApiModelProperty(value = "结束时间", hidden = false, example = "2021-06-01")
+ @Pattern(regexp = "^\\d{4}-\\d{2}-\\d{2}$", message = "时间格式错误")
+ private String endTime;
+
}
--
Gitblit v1.7.1