From 82c794aa1691821120ca4c6c8fda54a18cbb95f0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 16 七月 2020 11:01:32 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into xtyasrs

---
 src/main/java/com/zy/asrs/controller/WorkController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 5ac9cfc..ef1e032 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -111,7 +111,7 @@
             return R.ok("宸ヤ綔妗e凡鍙栨秷");
         } else if (type == 3) {
             workService.pickWrkMast(workNo, getUserId());
-            return R.ok("宸ヤ綔妗e凡鎷f枡鍏ュ簱");
+            return R.ok();
         }
         return R.ok();
     }

--
Gitblit v1.9.1