From 8b13ca9086a609ef3bae76dab15faba55123d2dd Mon Sep 17 00:00:00 2001 From: Null <281575458@qq.com> Date: 星期三, 17 三月 2021 09:17:47 +0800 Subject: [PATCH] 处理合并代码问题 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java index c2f1f9f..cdc32ec 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java @@ -65,6 +65,21 @@ @ApiModelProperty("动态内容富文本") private String content; + @ApiModelProperty("动态内容富文本--纯文本") + private String contentText; + @ApiModelProperty(value = "社区名字") private String communityName; + + @ApiModelProperty(value = "封面") + private String cover; + + @ApiModelProperty(value = "是否增加 1 增加 0 不增加") + private Integer isAdd; + + @ApiModelProperty(value = "分类:1-社区风采 2-社区动态") + private Integer type; + + @ApiModelProperty(value = "封面模式:1-小图展示 2-大图展示") + private Integer coverMode; } -- Gitblit v1.7.1