From 26cd8c7b2bc7a725a3de28d3ed883a6f54da84f1 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期二, 20 四月 2021 16:59:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.java
index d1cbbeb..8b14369 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.java
@@ -24,7 +24,7 @@
@ApiModelProperty("主题")
@NotBlank(groups = {AddGroup.class},message = "主题不能为空")
- private String subject;
+ private String discussSubject;
@ApiModelProperty("类型 1 图文 2 投票")
@Min(value =1,groups = {AddGroup.class},message = "类型不能为空")
@@ -46,7 +46,7 @@
private Date createAt;
@ApiModelProperty("1 单选 2 多选")
- private Integer option;
+ private Integer discussOption;
@ApiModelProperty("投票标题")
private String voteTitle;
--
Gitblit v1.7.1