Merge branch 'mdqdasrs-auto' into mdqdasrsVersion

whycq

2025-01-08 ac92d2777fc472ae766e2bd6209c70691fe5dc5b

 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 {