From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 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 95e4457..01f822a 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
@@ -158,6 +158,9 @@
@ApiModelProperty(value = "社区id", hidden = true)
private Long communityId;
+ @ApiModelProperty(value = "社区id集合", hidden = true)
+ private List<Long> communityIds;
+
@ApiModelProperty(value = "社区名称")
private String communityName;
@@ -333,4 +336,10 @@
@ApiModelProperty("清单信息")
private ComActNeighborCircleDetailAppVO listDetail;
+
+ @ApiModelProperty("奖励金汇币")
+ private String jinhuiCoinAward;
+
+ @ApiModelProperty("惩罚金汇币")
+ private String jinhuiCoinPunishment;
}
--
Gitblit v1.7.1