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

zc

2024-09-03 fde7a28aae0a134821d6eb5ebaa5e6319cb73139

 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高低检测异常");