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

zjj

2025-02-21 0355ffdf65a1d3ac6202dbddd5b49f726b39bbad

 src/main/java/com/zy/common/service/CommonService.java

@@ -652,7 +652,7 @@
                    continue;
                }
                for (LocMast locMastGro1 : locMasts1) {
                    if (locMastGro1.getLocSts().equals("P") || locMastGro1.getLocSts().equals("Q") || locMastGro1.getLocSts().equals("R")) {
                    if (locMastGro1.getLocSts().equals("P") || locMastGro1.getLocSts().equals("Q") || locMastGro1.getLocSts().equals("R") || locMastGro1.getLocSts().equals("X")) {
                        break;
                    }
                    if (locMastGro1.getLocSts().equals("O")){