Merge remote-tracking branch 'origin/bfasrs' into bfasrs

Junjie

2023-05-24 4c98ecfe56a77a17352d01163b9b86fa98f0f2a9

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

@@ -146,6 +146,7 @@
                if (!locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()))) {
                    throw new CoolException("服务器错误，请联系管理员");
                }
                locMast.setBarcode("");
            }
        }
        locMast.setModiUser(getUserId());