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

cjl

2024-08-09 a022ae9804d0c2f402711b6b5202319d853919cf

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

@@ -22,11 +22,11 @@
    /**
     *未生效
     */
    NOT_EFFECTIVE(10, "未生效"),
    NOT_EFFECTIVE(0, "未生效"),
    /**
     *已生效
     */
    TAKE_EFFECT(20, "已生效");
    TAKE_EFFECT(1, "已生效");

    @EnumValue
    public  final Integer value;