Merge remote-tracking branch 'origin/master'

16639036659

2022-09-19 58b0713d68fa8fef72a39c1ea6102dd36a4d2a9c

 src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskUnitUuid.java

@@ -10,7 +10,7 @@
    /**

     * 主键

     * */

    @TableId(type = IdType.AUTO)

    @TableId(value = "id" , type = IdType.AUTO)

    private Long id;

    /**

     * 风险分析单元（设施区域）id