Merge branch 'hemenkou_dev' into dev

101captain

2022-02-23 60c38c655045c1ef30834e5cfe94fb727d209970

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

@@ -219,4 +219,9 @@
     * 项目id
     */
    private Long projectId;

    /**
     * 1志愿者活动 2居民活动 3党员活动 4项目活动
     */
    private Integer type;
}