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

lty

昨天 8fe628e31d57f10f83b0c7b73aa4506e8d888c48

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

@@ -310,14 +310,14 @@
    }

    public String getFrozen$() {
        if (null == this.frozen){ return null; }
        if (null == this.frozen){ return "未冻结"; }
        switch (this.frozen){
            case 0:
                return "未冻结";
            case 1:
                return "已冻结";
            default:
                return null;
                return "未冻结";
        }
    }