Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2023-11-15 be8a4a6f82bd32dc5a3cf2e038848012f336f644

 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;