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

pang.jiabao

2025-05-13 8b930fed6099a4b21c4c16d6a41e305a2c9c7e40

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

@@ -155,7 +155,7 @@
            }
        }
        if (locMast.getLocSts().equals("O")) {
            locMast.setBarcode(null);
            locMast.setBarcode("");
        }
        locMast.setModiUser(getUserId());
        locMast.setModiTime(new Date());