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

Junjie

2023-03-20 7bea8428d74527993cb4ae47d01c79850b5f34bc

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