Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

wangfei

2024-08-27 7f4ae8816d0df23ec4e31b72a9a961a5d49d365d

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

@@ -65,7 +65,7 @@
        if(glass != null) {
            return temperingMapper.selectByEngineerIdAndLayoutId(glass.getEngineerId(),glass.getTemperingLayoutId());
        }
            return  null;
        return  null;
    }

    @Override
@@ -93,7 +93,7 @@
    }

    @Override
        public List<TemperingGlassInfo> selectTaskType() {
    public List<TemperingGlassInfo> selectTaskType() {
        QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
        wrapper.select("state")
                .groupBy("state");