From adc03660c3592d4d87076c4fefcbb86280610c4a Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期三, 25 八月 2021 13:29:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmasrs' into xgmasrs

---
 src/main/java/com/zy/ints/controller/WaitMatinController.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/ints/controller/WaitMatinController.java b/src/main/java/com/zy/ints/controller/WaitMatinController.java
index e91a819..aca57b3 100644
--- a/src/main/java/com/zy/ints/controller/WaitMatinController.java
+++ b/src/main/java/com/zy/ints/controller/WaitMatinController.java
@@ -9,7 +9,6 @@
 import com.core.common.Cools;
 import com.core.common.DateUtils;
 import com.core.common.R;
-import com.zy.asrs.entity.LocDetl;
 import com.zy.asrs.entity.MatCode;
 import com.zy.asrs.service.MatCodeService;
 import com.zy.common.entity.KeyValueVo;

--
Gitblit v1.9.1