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

zhou zhou

2 天以前 538ef535070576393224aba7ad43f0a52c98bddb

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

@@ -14,7 +14,8 @@
    ORDER_TRANSFER("transfer", "调拔单"),
    ORDER_REVISE("revise", "库存调整"),
    ORDER_CHECK("check", "盘点单"),
    ORDER_Pre("pre","备货单");
    ORDER_PRE("pre","备货单,出库"),
    ORDER_PRE_NOT_OUT("preNot","备货单，不出");


    OrderType(String type, String desc) {