Merge remote-tracking branch 'origin/test' into test

101captain

2021-09-27 452d9c350233e35e66545d77938a93addcc39716

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussDO.java

@@ -89,7 +89,7 @@
    /**
     * 单张图片高度
     */
    private Integer imgHeight;
    private BigDecimal imgHeight;

    /**
     * 开始时间
@@ -152,6 +152,11 @@
    private Date updateAt;

    /**
     * 公布人id
     */
    private Long publishBy;

    /**
     * 类型 1 议事 2 投票
     */
    public interface type{