Merge branch 'release-fix' into release

35c73cd1 · zhengyi · be374b20 · 9749efb6 · 35c73cd1
Commit 35c73cd1 authored Sep 02, 2024 by zhengyi
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

OrderMapper.xml ...rder-core/src/main/resources/mapper/order/OrderMapper.xml +1 -1

No files found.
--- a/yudao-module-order/yudao-module-order-core/src/main/resources/mapper/order/OrderMapper.xml
+++ b/yudao-module-order/yudao-module-order-core/src/main/resources/mapper/order/OrderMapper.xml
@@ -2642,7 +2642,7 @@
                            or o.`cargo_control_status` = 1 AND (select count(1) from ecw_order_cargo_control_pick ccp2 where ccp2.order_id = o.order_id and ccp2.status = 1) > 0
                        </when>
                        <otherwise>
-                            or o.`cargo_control_status` = #{query.cargoControlStatus}
+                            or o.`cargo_control_status` = #{cargoControlStatus}
                        </otherwise>
                    </choose>
                </foreach>