Merge branch 'repair'
This commit is contained in:
commit
57f5f46709
@ -712,7 +712,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
</where>
|
</where>
|
||||||
</select>
|
</select>
|
||||||
<select id="pageWorkOrderNew" resultType="cn.iocoder.yudao.module.inspection.entity.InspectionInfo">
|
<select id="pageWorkOrderNew" resultType="cn.iocoder.yudao.module.inspection.entity.InspectionInfo">
|
||||||
select distinct ins.*,oi.goods_title,su.nickname as buyName,su.mobile as buyPhone,oi.sku_name,oi.pay_money as
|
select distinct ins.*,oi.goods_title,ins.buy_name as buyName,ins.buy_phone as buyPhone,oi.sku_name,oi.pay_money as
|
||||||
realPayMoney
|
realPayMoney
|
||||||
,oi.pay_type,oi.order_status as
|
,oi.pay_type,oi.order_status as
|
||||||
orderStatus,oi.goods_id,oi.sku_id,oi.pay_time,oi.goods_price,oi.cashier_confirm,oi.cashier_confirm_remark,oi.cashier_confirm_time
|
orderStatus,oi.goods_id,oi.sku_id,oi.pay_time,oi.goods_price,oi.cashier_confirm,oi.cashier_confirm_remark,oi.cashier_confirm_time
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user