Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-13 e74987c5c7e6256e84a0852f36a367bf8f2e032d

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

@@ -92,7 +92,11 @@
    /**
     * 状态 0 启用 1 禁用
     */
    private boolean state;
    private Integer state;

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

}