Merge remote-tracking branch 'origin/master'

huanghongfa

2021-03-30 bd563bebae7b472fadbf348ec85367bbda3f3193

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

@@ -94,5 +94,10 @@
     */
    private Integer state;

    /**
     * 街道ID
     */
    private Long streetId;


}