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

zhang

2026-03-31 504930c323050e2a32d795392147e97edf7f2f03

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/LocController.java

@@ -236,7 +236,7 @@

            loc.setUpdateBy(userId);
            loc.setUpdateTime(now);
            if (loc.getId()==null){
            if (loc.getId() == null){
                if (!locService.save(loc)) {
                    throw new CoolException(locNo + " save fail !");
                }