Merge remote-tracking branch 'origin/master'

zhoushihao

2024-10-11 d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678

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

@@ -88,7 +88,7 @@
        wrapper.select("tempering_layout_id,engineer_id,max(id) as id")
                .eq("state",2)
                .groupBy("tempering_layout_id,engineer_id")
                .orderByDesc("id");
                .orderByAsc("id");
        return temperingMapper.selectList(wrapper);
    }