From 99cb2c90446f279fd2d19e5b35c31fab5400b8fe Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 23 Oct 2018 20:30:53 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8A=BC=E9=87=91=E8=B4=A6=E5=8D=95][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=9F=A5=E8=AF=A2]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/tenant/TenantInfoImpl.java | 5 +++++ .../java/com/iformall/domain/po/WxBillDeposit.java | 13 ++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 32d0be0e0..b2628a2a0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -63,6 +63,9 @@ public class TenantInfoImpl implements TenantInfo { if ("wx_bill_rent".equals(tableName)) { return true; } + if ("wx_bill_deposit".equals(tableName)) { + return true; + } // wx_profit_sharing_receiver // wx_profit_sharing_result return false; @@ -74,6 +77,8 @@ public class TenantInfoImpl implements TenantInfo { return true; if ("com.iformall.mapper.WxBillRentMapper.updateWaitPayStatus".equals(ms.getId())) return true; + if ("com.iformall.mapper.WxBillDepositMapper.updateWaitPayStatus".equals(ms.getId())) + return true; return false; } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java index 60dc05644..23030d341 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java @@ -39,9 +39,10 @@ public class WxBillDeposit 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; @@ -187,7 +188,13 @@ public class WxBillDeposit implements Serializable { updatetime = _updatetime; } + public String getMerchantName() { + return merchantName; + } + public void setMerchantName(String merchantName) { + this.merchantName = merchantName; + } public static enum Field {