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

野心家

2025-01-08 c688ad2d55d6a5355e0e75402177f3e7989600bc

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

@@ -150,7 +150,7 @@
                        .eq("loc_no", shallowLoc));
                if (!Cools.isEmpty(locMast2)) {
                    if (locMast2.getLocSts().equals("F") || locMast2.getLocSts().equals("D")){
                        tmp = locMast2;
                        tmp = mast;
                    }
                }
            }else {