diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index 8a6c5489a..fec786bbc 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -75,12 +75,12 @@ rent_shop_type,'[]' shop_info,NULL comments from wx_bill_daily where tenant_id=#{tenantId} union all - select id,merchant_id,shop_id,tenant_id,name,7 bill_type_value,'其他费用' bill_type,0 as + select id,merchant_id,shop_id,tenant_id,name,7 bill_type_value,name as bill_type,0 as need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' endtime, rent_shop_type,'[]' shop_info,comments from wx_bill_other where tenant_id=#{tenantId} union all - select id,merchant_id,shop_id,tenant_id,comments as name,8 bill_type_value,'其他押金' bill_type,0 as + select id,merchant_id,shop_id,tenant_id,comments as name,8 bill_type_value,comments as bill_type,0 as need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' endtime, rent_shop_type,'[]' shop_info,comments from wx_bill_other_deposit where tenant_id=#{tenantId}