From aaf2544c2f2db27c8740927dfa4da35a56bc4d81 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 18 Oct 2018 16:23:45 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=B4=A6=E5=8D=95=E7=AE=A1=E7=90=86][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E5=8A=A0=E5=95=86=E6=88=B7=E5=90=8D=E7=A7=B0]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/domain/po/WxBillRent.java | 15 ++++++++++++--- .../main/resources/mapper/WxBillRentMapper.xml | 1 + 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java index 6dec37758..4056a7d7e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java @@ -36,9 +36,10 @@ public class WxBillRent implements Serializable { public void setIds(List ids) { this.ids = ids; } - - - + + @Transient + private String merchantName; + /*租金合同ID**/ @io.swagger.annotations.ApiModelProperty(value="租金合同ID",name="rentContractId") private Long rentContractId; @@ -89,6 +90,14 @@ public class WxBillRent implements Serializable { @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") private Date updatetime; + public String getMerchantName() { + return merchantName; + } + + public void setMerchantName(String merchantName) { + this.merchantName = merchantName; + } + public Long getRentContractId() { return rentContractId; } diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index af213ec50..ec46c377e 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -75,6 +75,7 @@ and br.`id` = #{id} and br.`merchant_id` = #{merchantId} + and m.`merchant_name` = #{merchantName} and br.`tenant_id` = #{tenantId} and br.`status` = #{status} and br.`is_del` = #{isDel}