From 5fe9c379f0cc696568a0db249026a1e8a3b02a5a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期二, 15 九月 2020 13:52:39 +0800
Subject: [PATCH] Merge branch 'gdasrs' of https://gitee.com/luxiaotao1123/zy-asrs into gdasrs
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index a2a3819..ab5d3ab 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -96,7 +96,7 @@
return R.error();
}
LocMast oldLocMast = locMastService.selectById(locMast.getLocNo());
- // 鏈夌墿鏂欐椂淇敼涓虹┖搴撲綅鎴栬�呯┖鏉垮簱浣嶏紝鍒欏垹闄ゅ簱瀛樻槑缁�
+ // 鏈変骇鍝佹椂淇敼涓虹┖搴撲綅鎴栬�呯┖鏉垮簱浣嶏紝鍒欏垹闄ゅ簱瀛樻槑缁�
if (oldLocMast.getLocSts().equals("R") || oldLocMast.getLocSts().equals("F")) {
if (locMast.getLocSts().equals("O") || locMast.getLocSts().equals("D")) {
locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
--
Gitblit v1.9.1