Merge remote-tracking branch 'origin/master'

wu

2024-12-23 b9b44b51b201e2f5a9a1f3665c7fb76b5690f9af

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java

@@ -4,7 +4,6 @@
import com.mes.engineering.entity.Engineering;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.entity.dto.HollowGlassInfoDTO;
import com.mes.uppattenusage.entity.UpPattenUsage;

import java.util.List;
import java.util.Map;
@@ -22,7 +21,7 @@
       * 查询小片表
       * @return List<GlassInfo>
       */
      List<GlassInfo> selectGlassInfo(String engineeringId);
      List<GlassInfo> selectGlassInfo(Engineering engineeringId);
      /**
       * 保存小片表
       */