Merge branch 'v6.4_transportation_20231110' into test

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

@@ -393,7 +393,7 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
 
     @Override
     public IPage<OrderChildVO> orderChildCancelRecord(OrderChildCancelRecordParam param) {
-        Page<OrderGoodsVO> page = Page.of(param.getPage(), param.getPageSize());
+        Page<OrderChildVO> page = Page.of(param.getPage(), param.getPageSize());
         return baseMapper.orderChildCancelRecord(page,param);
     }
 

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

@@ -78,5 +78,5 @@ public interface OrderChildMapper extends BaseMapper<OrderChild> {
     OrderChildVO findArtificialCancelOrder(@Param("orderChildNo") String orderChildNo);
 
     @SelectProvider(type = OrderChildSqlProvider.class, method = "orderChildCancelRecord")
-    IPage<OrderChildVO> orderChildCancelRecord(@Param("page")Page<OrderGoodsVO> page, @Param(value = "param") OrderChildCancelRecordParam param);
+    IPage<OrderChildVO> orderChildCancelRecord(@Param("page")Page<OrderChildVO> page, @Param(value = "param") OrderChildCancelRecordParam param);
 }
\ No newline at end of file