Merge branch 'test' into 'four_member'

罗元桥

2021-09-24 09e41d546b030b47661877d4b8141c88584d7598

 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;

    /**
     * 开始时间