master合并分支

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

@@ -96,7 +96,7 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
                                                   @Param("receiveAddressId") Integer receiveAddressId);
 
     @SelectProvider(type = OrderGoodsSqlProvider.class, method = "indexOrderGoodsListSearch")
-    IPage<OrderGoodsAPPVO> indexOrderGoodsListSearch(@Param("page")Page<OrderGoodsAPPVO> page, @Param("param")AppGoodsOrderSearchParam param);
+    IPage<OrderGoodsAPPVO> indexOrderGoodsListSearch(@Param("page")Page<OrderGoodsAPPVO> page, @Param("param") AppGoodsOrderSearchParam param);
 
 
     @SelectProvider(type = OrderGoodsSqlProvider.class, method = "queryProcessFleetOpenTruckList")