Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms

skyouc

5 天以前 3f2b778ab3fbee3d851ed7033451cc008366ab4b

 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;