Merge remote-tracking branch 'origin/master'

zhoushihao

2024-08-06 c5a2b71990cabc221834b856c99954677f1b5646

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/mapper/EngineeringMapper.java

File was renamed from hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/mapper/EngineeringMapper.java
@@ -1,7 +1,7 @@
package com.mes.engineering.mapper;

import com.mes.engineering.entity.Engineering;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mes.engineering.entity.Engineering;

/**
 * <p>