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

lty

2025-05-22 8b3be4349caa74d2dd1b834a250cb45a936e727f

 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));
    }