Merge branch 'dev_engineer_work_dynamics' into 'develop'

修改

See merge request !234

project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerTimelineServiceImpl.java

@@ -100,7 +100,8 @@ public class EngineerTimelineServiceImpl implements EngineerTimelineService {
 		// 获取配送站location
 		LambdaQueryWrapper<OrgWarehouseInfo> lqw = new LambdaQueryWrapper<>();
 		lqw.eq(OrgWarehouseInfo::getBranchId, branchId);
-		OrgWarehouseInfo w = warehouseInfoMPDao.selectOne(lqw);
+		List<OrgWarehouseInfo> wares = warehouseInfoMPDao.selectList(lqw);
+		OrgWarehouseInfo w = wares.get(0);
 		return String.format("%s,%s", w.getX(), w.getY());
 	}