Merge branch 'west_bigscreen_dev' into 'master'

罗元桥

2021-12-14 ecde7a30a43e3d45be2f0f9e271d0abf02c7d58e

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

@@ -22,7 +22,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.INPUT)
    @TableId(value = "id",type = IdType.INPUT)
    private Long id;

    /**