From e6cbabca48ede168c6cfd9b85007210679b3ac40 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Fri, 14 Aug 2020 11:03:40 +0800 Subject: [PATCH] update --- .../resources/mapper/WxRentContractMapper.xml | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index c926045c2..1039b9e90 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -94,40 +94,40 @@ where 1 = 1 and `id` = #{id} - and `merchant_id` = #{merchantId} - and `price` = #{price} - and `rental_start_date` = #{rentalStartDate} - and `rental_end_date` = #{rentalEndDate} - and `sign_date` = #{signDate} - and `receive_period` = #{receivePeriod} + and `merchant_id` = #{merchantId} + and `price` = #{price} + and `rental_start_date` = #{rentalStartDate} + and `rental_end_date` = #{rentalEndDate} + and `sign_date` = #{signDate} + and `receive_period` = #{receivePeriod} and `tenant_id` = #{tenantId} and `parent_tenant_id` = #{parentTenantId} - and `filepath` = #{filepath} - and `status` = #{status} - and `contract_number` = #{contractNumber} - and `deposit` = #{deposit} - and `pay_date` = #{payDate} - and `is_del` = #{isDel} - and `merchant_name` = #{merchantName} - and `brand` = #{brand} - and `business_id` = #{businessId} - and `shop_type` = #{shopType} - and `updatetime` = #{updatetime} - and `createtime` = #{createtime} - and `link_person` = #{linkPerson} - and `link_phone` = #{linkPhone} - and `pay_account` = #{payAccount} - and `filename` = #{filename} - and `lease` = #{lease} - and `type` = #{type} - and `start_date` = #{startDate} - and `end_date` = #{endDate} - and `rent_shop_type` = #{rentShopType} - and `operation_type` = #{operationType} + and `filepath` = #{filepath} + and `status` = #{status} + and `contract_number` = #{contractNumber} + and `deposit` = #{deposit} + and `pay_date` = #{payDate} + and `is_del` = #{isDel} + and `merchant_name` = #{merchantName} + and `brand` = #{brand} + and `business_id` = #{businessId} + and `shop_type` = #{shopType} + and `updatetime` = #{updatetime} + and `createtime` = #{createtime} + and `link_person` = #{linkPerson} + and `link_phone` = #{linkPhone} + and `pay_account` = #{payAccount} + and `filename` = #{filename} + and `lease` = #{lease} + and `type` = #{type} + and `start_date` = #{startDate} + and `end_date` = #{endDate} + and `rent_shop_type` = #{rentShopType} + and `operation_type` = #{operationType} and id in @@ -588,7 +588,7 @@ and floor in (${floorForRule})) - + order by ${sortColumns}