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

1

22 小时以前 c620f4cbc6f5ed50758ea548855773bfed2dcd39

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

@@ -20,6 +20,8 @@

    TASK_RESOUCE_STOCK_UP("7", "备货出库任务"),

    TASK_RESOUCE_STOCK_NOT_OUT("8", "备货出库任务"),

    ;
    TaskResouceType(String val, String desc) {
        this.val = Short.parseShort(val);