Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

IZCD4L12RTSW0VZ\Administrator

2 天以前 c8712bbf027d7c3db9c33f8b015abed1473d06a7

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

@@ -30,9 +30,9 @@
            throw new CoolException("plc高低检测异常");
        }
        if (basDevp.getLocType1() == 1) {
            this.locType1 = 1; // 小库位
            this.locType1 = 1; // 低库位
        } else {
            this.locType1 = 2; // 大库位
            this.locType1 = 2; // 高库位
        }
        log.info(JSON.toJSONString(this));
    }