Merge remote-tracking branch 'origin/master'

wangfei

2024-10-21 8785b6b5ee9298308752b53bf546953ae49b8c88

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/mapper/UpWorkstationMapper.java

@@ -3,9 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mes.workstation.entity.UpWorkSequence;
import com.mes.workstation.entity.UpWorkstation;
import io.lettuce.core.dynamic.annotation.Param;

import java.util.List;
import org.apache.ibatis.annotations.Param;

/**
 * <p>