Skip to content

J
jiedao-api-boot-master
Commit 35c73cd1 authored by zhengyi's avatar zhengyi
Browse files
Options

Merge branch 'release-fix' into release

parents be374b20 9749efb6
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
yudao-module-order/yudao-module-order-core/src/main/resources/mapper/order/OrderMapper.xml
View file @ 35c73cd1
...@@ -2642,7 +2642,7 @@ ...@@ -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 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> </when>
<otherwise> <otherwise>
or o.`cargo_control_status` = #{query.cargoControlStatus} or o.`cargo_control_status` = #{cargoControlStatus}
</otherwise> </otherwise>
</choose> </choose>
</foreach> </foreach>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment