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

zjj

3 天以前 11e2b6d43b6c1664f74963649dad9507db34c6ae

 src/main/java/com/zy/asrs/entity/WrkMast.java

@@ -371,7 +371,7 @@
        if (!Cools.isEmpty(locMast)){
            return String.valueOf(locMast.getLocNo());
        }
        return null;
        return this.locNo;
    }

    public String getStaNo$(){
@@ -398,7 +398,7 @@
        if (!Cools.isEmpty(locMast)){
            return String.valueOf(locMast.getLocNo());
        }
        return null;
        return this.sourceLocNo;
    }

    public String getIoTime$(){