Merge branch 'master' of http://47.97.1.152:5880/r/zy-wcs-master

skyouc

5 天以前 4bf0426314e8eb19b632861603206c4c288647bf

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

@@ -255,4 +255,26 @@
        return rowList;
    }

    public List<Integer> getDisableStationOneBays$(){
        List<Integer> list = new ArrayList<>();
        if (Cools.isEmpty(this.disableStationOneBays)){
            return list;
        }

        List<Integer> jsonList = JSON.parseArray(this.disableStationOneBays, Integer.class);
        list.addAll(jsonList);
        return list;
    }

    public List<Integer> getDisableStationTwoBays$(){
        List<Integer> list = new ArrayList<>();
        if (Cools.isEmpty(this.disableStationTwoBays)){
            return list;
        }

        List<Integer> jsonList = JSON.parseArray(this.disableStationTwoBays, Integer.class);
        list.addAll(jsonList);
        return list;
    }

}