Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

zhou zhou

2 天以前 fb98cd280dd1158e542cc8b94003612700ae4ea4

 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;