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

L

20 小时以前 7e0fe9378b0a4180d0bd1d74f6744285ebacdfdb

 src/main/java/com/zy/common/model/LocTypeDto.java

@@ -22,6 +22,9 @@
    // 轻重类型{0:未知,1:轻库位,2:重库位}
    private Short locType3;

    public LocTypeDto() {
    }

    public LocTypeDto(BasDevp basDevp) {
        if (basDevp.getLocType1() == null || basDevp.getLocType1() == 0) {
            throw new CoolException("plc高低检测异常");