From 464f5bc9f65e3fdedc5c70793a739cf2c4fb3199 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 17 Jul 2019 18:17:32 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=B4=A6=E5=8D=95=E6=80=BB=E8=A7=88][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E7=B1=BB=E5=9E=8B=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/resources/mapper/WxBillAllMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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}