Merge remote-tracking branch 'origin/dev' into qa

cjl

2023-10-20 a3eaa78c6d839b640c728f4c7d8eb27732627b07

 screen-api/src/main/java/com/moral/api/pojo/enums/SysDictTypeEnum.java

@@ -22,6 +22,7 @@

    SYS_SECOND_CRUISER("ZHC","秒级走航车"),

    WIND_FARM_SCOPE("WIND","风场范围"),
    ;

    @EnumValue