From 1e3b97098151f2d0471de6e8103b6cdaa6b5099d Mon Sep 17 00:00:00 2001 From: puhanshu <a9236326> Date: 星期六, 18 九月 2021 09:15:59 +0800 Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into auth --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussDO.java | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 115 insertions(+), 2 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussDO.java index f11e2b9..455b4e2 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussDO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussDO.java @@ -1,6 +1,7 @@ package com.panzhihua.service_community.model.dos; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; import com.baomidou.mybatisplus.annotation.*; @@ -9,7 +10,7 @@ /** * @program: springcloud_k8s_panzhihuazhihuishequ - * @description: 一起议 + * @description: 议事投票 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-22 14:48 **/ @@ -30,7 +31,7 @@ private String discussSubject; /** - * 类型 1 图文 2 投票 + * 类型 1 议事 2 投票 */ private Integer type; @@ -70,4 +71,116 @@ */ private String voteTitle; + /** + * 是否可重复投票(1.是 2.否) + */ + private Integer isRepeat; + + /** + * 每人票数 + */ + private Integer count; + + /** + * 单张图片宽度 + */ + private BigDecimal imgWidth; + + /** + * 单张图片高度 + */ + private BigDecimal imgHeight; + + /** + * 开始时间 + */ + private Date startTime; + + /** + * 结束时间 + */ + private Date endTime; + + /** + * 评论数 + */ + private Integer commentNum; + + /** + * 点赞数 + */ + private Integer fabulousNum; + + /** + * 浏览量 + */ + private Integer viewsNum; + + /** + * 参与人数 + */ + private Integer joinNum; + + /** + * 状态(1.未开始 2.进行中 3.待公布 4.已公布 5.已发布) + */ + private Integer status; + + /** + * 是否已删除(1.是 2.否) + */ + private Integer isDel; + + /** + * 公布结果 + */ + private String publishResult; + + /** + * 公布时间 + */ + private Date publishAt; + + /** + * 发布时间 + */ + private Date releaseAt; + + /** + * 修改时间 + */ + private Date updateAt; + + /** + * 公布人id + */ + private Long publishBy; + + /** + * 类型 1 议事 2 投票 + */ + public interface type{ + int ys = 1; + int tp = 2; + } + + /** + * 是否枚举(1.是 2.否) + */ + public interface isOk{ + int yes = 1; + int no = 2; + } + + /** + * 状态(1.未开始 2.进行中 3.待公布 4.已公布 5.已发布) + */ + public interface status{ + int wks = 1; + int jxz = 2; + int dgb = 3; + int ygb = 4; + int yfb = 5; + } + } -- Gitblit v1.7.1