Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into xtyasrs

luxiaotao1123

2020-07-16 82c794aa1691821120ca4c6c8fda54a18cbb95f0

 src/main/java/com/zy/asrs/controller/WorkController.java

@@ -111,7 +111,7 @@
            return R.ok("工作档已取消");
        } else if (type == 3) {
            workService.pickWrkMast(workNo, getUserId());
            return R.ok("工作档已拣料入库");
            return R.ok();
        }
        return R.ok();
    }