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

skyouc

7 天以前 d2e0994f67495fd436a2e8ad02cb7e4a7e53fe0c

 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;