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

cjl

2023-12-18 68e750bf109efb0469704e54e48a29649512358c

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

@@ -26,7 +26,7 @@
    /**
     *已生效
     */
    No(0, "否");
    NO(0, "否");

    @EnumValue
    public  final Integer value;