Commit 3bdf487a authored by yanghao's avatar yanghao

Merge branch 'release-fix' into release

parents 9ffeceec d6fbd6ad
...@@ -1675,6 +1675,7 @@ ...@@ -1675,6 +1675,7 @@
o.is_exception, o.is_exception,
o.create_time, o.create_time,
o.load_time, o.load_time,
o.unload_time,
o.customer_id, o.customer_id,
(select su.nickname from system_user su where su.deleted = 0 and su.id = o.salesman_id) as salesman_name, (select su.nickname from system_user su where su.deleted = 0 and su.id = o.salesman_id) as salesman_name,
(select min(wi.`in_time`) from ecw_order_warehouse_in wi where wi.deleted = 0 and wi.order_id = o.order_id ) as (select min(wi.`in_time`) from ecw_order_warehouse_in wi where wi.deleted = 0 and wi.order_id = o.order_id ) as
......
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