master合并到5.7

performance-web/src/main/java/com/clx/performance/controller/pc/GoodsOrderController.java

@@ -2,8 +2,6 @@ package com.clx.performance.controller.pc;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.order.feign.OrderFeign;
-import com.clx.order.params.OrderGoodsParams;
-import com.clx.order.params.PageOrderGoodsListParam;
 import com.clx.performance.param.pc.OrderGoodsCancelParam;
 import com.clx.performance.param.pc.UpdateEditOrderGoodsParam;
 import com.clx.performance.param.pc.OrderGoodsParams;

performance-web/src/main/java/com/clx/performance/dao/OrderGoodsDao.java

@@ -2,7 +2,6 @@ package com.clx.performance.dao;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.order.params.OrderGoodsEditParams;
-import com.clx.order.params.PageOrderGoodsListParam;
 import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.mapper.OrderGoodsMapper;
 import com.clx.performance.model.OrderGoods;

performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.order.params.OrderGoodsEditParams;
-import com.clx.order.params.PageOrderGoodsListParam;
 import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.enums.OrderGoodsStatusEnum;

performance-web/src/main/java/com/clx/performance/mapper/OrderGoodsMapper.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.order.params.OrderGoodsEditParams;
-import com.clx.order.params.PageOrderGoodsListParam;
 import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.sqlProvider.OrderGoodsSqlProvider;

performance-web/src/main/java/com/clx/performance/service/OrderGoodsService.java

@@ -2,7 +2,6 @@ package com.clx.performance.service;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.clx.order.params.PageOrderGoodsListParam;
 import com.clx.performance.param.pc.OrderGoodsCancelParam;
 import com.clx.performance.param.pc.UpdateEditOrderGoodsParam;
 import com.clx.performance.param.pc.PageOrderGoodsListParam;

performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java

@@ -8,9 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.order.enums.VehicleUsageEnum;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.param.feign.RollbackOrderWeightParam;
-import com.clx.order.params.OrderGoodsChildParams;
 import com.clx.order.params.OrderGoodsEditParams;
-import com.clx.order.params.PageOrderGoodsListParam;
 import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.component.GoodsOrderTruckRecordComponent;

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsSqlProvider.java

@@ -2,7 +2,6 @@ package com.clx.performance.sqlProvider;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.order.params.OrderGoodsEditParams;
-import com.clx.order.params.PageOrderGoodsListParam;
 import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.enums.OrderGoodsStatusEnum;
 import com.clx.performance.enums.OrderGoodsStopEnum;

performance-web/src/main/java/com/clx/performance/strategy/GoodsOrderStrategy.java

 package com.clx.performance.strategy;
 
+import com.clx.performance.param.pc.OrderGoodsChildParams;
 import com.clx.performance.param.pc.OrderGoodsParams;
 import com.clx.order.enums.OrderStopEnum;
 import com.clx.order.enums.ResultEnum;
-import com.clx.order.params.OrderGoodsChildParams;
-import com.clx.order.params.OrderGoodsParams;
 import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.dao.OrderGoodsTruckBindDao;