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

lty

2025-03-30 10610f52857314807b054d16e81b7fcda0137f58

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

@@ -154,6 +154,9 @@
                return R.error("容器编码或容器类型有误");
            }
        }
        if (locMast.getLocSts().equals("O")){
            locMast.setBarcode(null);
        }
        locMast.setModiUser(getUserId());
        locMast.setModiTime(new Date());
        locMastService.updateById(locMast);