Merge branch 'master-fix' into release

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxAirNumberRecord/BoxAirNumberRecordServiceImpl.java

@@ -176,6 +176,7 @@ public class BoxAirNumberRecordServiceImpl extends AbstractService<BoxAirNumberR
         BoxAirNumberRecordDO maxBoxAirNumberRecordDO = boxAirNumberRecordMapper.selectOne(new LambdaQueryWrapper<BoxAirNumberRecordDO>()
                 .eq(BoxAirNumberRecordDO::getTransportType, transportType)
                 .eq(BoxAirNumberRecordDO::getDestCountryCode, destCountryCode)
+                .eq(BoxAirNumberRecordDO::getChannelCode, channelCode)
                 .orderByDesc(BoxAirNumberRecordDO::getId).last("limit 1"));
         // 根据最大的自编号生成最新的自编号
         String preChannelCode = "";