From 0ffc55f78dfb3cc561540af2d033e64c2f4f2e68 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 29 八月 2023 09:57:08 +0800
Subject: [PATCH] 新增商家管理模块
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java | 32 +++++---------------------------
1 files changed, 5 insertions(+), 27 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java
index 037113b..c9072be 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java
@@ -5,12 +5,11 @@
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.panzhihua.common.validated.AddGroup;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import javax.validation.constraints.NotNull;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -22,6 +21,7 @@
@ApiModel("党员活动")
public class PartyBuildingActivityVO {
@ApiModelProperty("党员活动id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("活动名称")
@@ -107,29 +107,7 @@
@ApiModelProperty("是否是个人发起 1 是 0 否")
private Integer isPerson;
- @ApiModelProperty("签到范围，默认0无限制")
- @NotNull(groups = AddGroup.class, message = "签到范围不可为空")
- private Integer range;
-
- @ApiModelProperty("是否有积分奖励（1.是 2.否）")
- @NotNull(groups = AddGroup.class, message = "是否有积分奖励不可为空")
- private Integer haveIntegralReward;
-
- @ApiModelProperty("积分奖励方式（1.按次奖励 2.记时奖励）")
- private Integer rewardWay;
-
- @ApiModelProperty("参与签到/打卡奖励积分")
- private Integer rewardIntegral;
-
- @ApiModelProperty("参与次数上限，按次奖励需传入")
- private Integer limit;
-
- @ApiModelProperty("是否允许取消（1.允许 2.不允许）")
- @NotNull(groups = AddGroup.class, message = "是否允许取消不可为空")
- private Integer canCancel;
-
- @ApiModelProperty("取消活动扣除积分数目")
- @NotNull(groups = AddGroup.class, message = "取消活动扣除积分数目不可为空")
- private Integer cancelDeduct;
+ @ApiModelProperty("二维码类型 1居民，志愿者 2党员")
+ private Integer codeType;
}
--
Gitblit v1.7.1