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

LSH

2023-09-26 bbfb525c87ab208f123f8f5a4c7c6a87df4a3a23

 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());