Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into ...

manailin

2021-11-03 c3811d01d1929a98a0f34f70ca187d82ee312dbb

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

@@ -204,4 +204,8 @@
     * 取消扣除积分
     */
    private Integer cancelDeduct;
    /**
     * 活动类型
     */
    private String activityType;
}