Merge branch 'dev' of https://gitee.com/luxiaotao1123/zy-asrs

luxiaotao1123

2020-07-11 8aef28e39575b910aa08c0c102c868d60fb306ea

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

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