From dcc80dd67d7527b78bbb44439858643f92891e4d Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 6 Aug 2019 15:18:50 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E5=90=8C=E5=AE=A1=E6=A0=B8=E7=8A=B6?= =?UTF-8?q?=E6=80=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/domain/vo/WxRentPropertyContractVo.java | 3 +++ .../src/main/resources/mapper/WxRentContractMapper.xml | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java index ef336e23e..dc414116a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java @@ -74,5 +74,8 @@ public class WxRentPropertyContractVo extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "物业费单价单位", name = "propertyPriceUnit") private Integer propertyPriceUnit; + + @io.swagger.annotations.ApiModelProperty(value = "审批流类型", name = "businessType") + private Integer businessType; } diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 7df772208..87e1e490e 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -326,7 +326,8 @@ select rc.id,rc.merchant_name,rc.rental_start_date,rc.rental_end_date,rc.`status`, rc.price as rent_price,rc.contract_number,s.shop_number,rc.type,rc.apply_status, rc.rent_shop_type,rc.rent_info,pc.price as property_price,rc.merchant_id,pc.`status` as property_status, - rc.price_unit as rent_price_unit,pc.price_unit as property_price_unit + rc.price_unit as rent_price_unit,pc.price_unit as property_price_unit, + rc.business_type businessType from wx_rent_contract rc left join wx_property_contract pc on rc.id=pc.rent_contract_id left join wx_shop s on rc.shop_id=s.id