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

zhou zhou

1 天以前 53526a6c99085577969aec2cdd0a13fe35394e0b

 rsf-server/src/main/java/com/vincent/rsf/server/common/enums/WarehouseAreaType.java

@@ -10,7 +10,8 @@
public enum WarehouseAreaType {
    //订单类型
    WAREHOUSE_AREA_RECEIPT("receipt", "收货区"),
    WAREHOUSE_AREA_COLLECTION("collection", "集货区"),
    WAREHOUSE_AREA_COLLECTION("collection", "存储区"),
    WAREHOUSE_AREA_CACHE("cache", "缓存区"),
    WAREHOUSE_AREA_DELIVERY("delivery", "发货区"),
    ;