Merge remote-tracking branch 'origin/master'

wangfei

2025-03-14 dacf6715218c6061d53220b456c75a559bc5af8f

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

@@ -2,6 +2,7 @@

import com.github.yulichang.base.MPJBaseService;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.entity.LoadGlassInfo;
import com.mes.temperingglass.entity.TemperingGlassInfo;

import java.util.List;
@@ -58,5 +59,5 @@

    GlassInfo selectTempering(GlassInfo glassInfo);

    List<GlassInfo> selectTemperingGlass(GlassInfo glassInfo);
    List<LoadGlassInfo> selectTemperingGlass(GlassInfo glassInfo);
}