Merge branch 'feature_OrderServiceList_wangl' into 'develop'

修改

See merge request !4

project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/EnginnerTimelineServiceImpl.java

@@ -12,6 +12,7 @@ import com.alibaba.cloud.integration.order.service.EnginnerTimelineService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 
 import java.sql.Timestamp;
 import java.sql.Timestamp;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatter;
@@ -38,6 +39,8 @@ public class EnginnerTimelineServiceImpl implements EnginnerTimelineService {
 	@Autowired
 	@Autowired
 	private WarehouseInfoDao warehouseInfoDao;
 	private WarehouseInfoDao warehouseInfoDao;
 
 
+	@Transactional
+	@Override
 	public Result<?> GetEnginnerTimelines(String engineerCode, String date){
 	public Result<?> GetEnginnerTimelines(String engineerCode, String date){
 
 
 		// 工程师姓名
 		// 工程师姓名