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

zjj

3 天以前 78dde5ad6acc2a49fd08472afb61a1504ea791d9

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

@@ -228,9 +228,9 @@
            case 0:
                return "未知";
            case 1:
                return "小库位";
                return "低库位";
            case 2:
                return "大库位";
                return "高库位";
            default:
                return String.valueOf(this.locType1);
        }