From da8cca4d320908b672f439369e65e9e6a95374e3 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 07 三月 2022 09:46:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/partyBuilding_lyq' into hemenkou_dev

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
index a9ece31..2ba1f1e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
@@ -114,7 +114,6 @@
     private String contactName;
 
     @ApiModelProperty("联系人电话")
-    @NotBlank(groups = AddGroup.class, message = "联系人电话不可为空")
     private String contactPhone;
 
     @ApiModelProperty("是否签到 1 是 0否")
@@ -244,7 +243,12 @@
     @ApiModelProperty("活动类型")
     @NotBlank(groups = AddGroup.class, message = "活动类型不能为空")
     private String activityType;
-    
+
+    private String areaCode;
+
+    @ApiModelProperty("单次活动时长(小时)")
+    private Integer duration;
+
     @ApiModelProperty("项目Id")
     private Long projectId;
 

--
Gitblit v1.7.1