Merge remote-tracking branch 'origin/v6.4_transportation_20231110' into test

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, OrderChildCancelRecordParam param);
+    IPage<OrderChildVO> orderChildCancelRecord(@Param("page")Page<OrderGoodsVO> page, @Param(value = "param") OrderChildCancelRecordParam param);
 }
\ No newline at end of file

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

@@ -161,7 +161,7 @@ public class OrderChildSqlProvider {
                 "date_format(unload_time, '%Y-%m-%d %H:%i:%s') as unloadTime  from order_child where child_no = #{orderChildNo}";
 
         sql += " and status >="+ OrderChildEnum.Status.LOAD.getCode();
-        sql += " and status <="+ OrderChildEnum.Status.UNSETTLE.getCode();
+        sql += " and status <"+ OrderChildEnum.Status.UNSETTLE.getCode();
         return sql;
     }