Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

2025-05-12 6d6a1b26fcdad0ae743a6e99c8f321969bd2345f

 rsf-server/src/main/java/com/vincent/rsf/server/system/enums/SerialRuleReset.java

@@ -14,7 +14,9 @@
    //重置类型：月
    SERIAL_REST_TYPE_MONTH("month", "月"),
    //重置类型：日
    SERIAL_REST_TYPE_DAYS("day", "日")
    SERIAL_REST_TYPE_DAYS("day", "日"),

    SERIAL_REST_TYPE_NON("non", "无")
    ;

    public String type;