Merge branch 'devlop' into devlop_whxrwms

skyouc

5 天以前 da0fd7be060ab4a0225c70c6572b2947484a2cb1

 rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/CheckDiffExceStatus.java

@@ -11,7 +11,7 @@

    //盘点差异单执行状态
    CHECK_DIFF_EXCE_STATUS_INIT("0", "初始化"),
    CHECK_DIFF_EXCE_STATUS_HOLD("1", "待审核"),
    CHECK_DIFF_EXCE_STATUS_HOLD("1", "处理中"),
    CHECK_DIFF_EXCE_STATUS_END("2", "已审核"),

    ;