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

chen.lin

昨天 c426aa30a98ce85b494de121c92e2a7d01673930

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

@@ -19,6 +19,7 @@
    TASK_TYPE_PICK_AGAIN_OUT("103", "拣料出库"),
    TASK_TYPE_MERGE_OUT("104", "并板出库"),
    TASK_TYPE_CHECK_OUT("107", "盘点出库"),
    TASK_TYPE_CROSS_DOCKING_OUT("109", "越库"),
    TASK_TYPE_EMPTY_OUT("110", "空板出库"),
    ;
    public Integer type;