Merge remote-tracking branch 'origin/master'

zhoushihao

2024-10-11 d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java

@@ -99,7 +99,7 @@
        //查询是否有开始上片的工程任务
        QueryWrapper<Engineering> wrapper = new QueryWrapper<>();
            wrapper.eq("state", state);
        return this.getOne(wrapper);
        return engineeringMapper.selectOne(wrapper);
    }

    @Override