Merge remote-tracking branch 'origin/master'

zhoushihao

2024-07-22 10157d188a8c247fed7b5537283ca71c6cc32fea

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java

@@ -30,7 +30,7 @@
        //获取等待进炉中的玻璃信息
        QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
        //wrapper.eq("state",1);
        wrapper.in("state",1,0);
        wrapper.in("state",1,0,-1);
        return temperingMapper.selectList(wrapper);
    }