diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
index 1d8ed6321..0e4cd180e 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
@@ -84,9 +84,7 @@ public class WxRentContract implements Serializable {
/*押金**/
@io.swagger.annotations.ApiModelProperty(value="押金",name="deposit")
private String deposit;
- /*首期款缴款日期**/
- @io.swagger.annotations.ApiModelProperty(value="首期款缴款日期",name="firstPayDate")
- private Date firstPayDate;
+
/*交租日 计租开始时间减去交租日的天数为基数 提前多少日交租**/
@io.swagger.annotations.ApiModelProperty(value="交租日 计租开始时间减去交租日的天数为基数 提前多少日交租",name="payDate")
private Integer payDate;
@@ -184,12 +182,6 @@ public class WxRentContract implements Serializable {
public void setDeposit(String _deposit) {
deposit = _deposit;
}
- public Date getFirstPayDate() {
- return firstPayDate;
- }
- public void setFirstPayDate(Date _firstPayDate) {
- firstPayDate = _firstPayDate;
- }
public Integer getPayDate() {
return payDate;
}
@@ -269,7 +261,6 @@ public class WxRentContract implements Serializable {
,Status_ASC("`status` ASC"),Status_DESC("`status` DESC")
,ContractNumber_ASC("`contract_number` ASC"),ContractNumber_DESC("`contract_number` DESC")
,Deposit_ASC("`deposit` ASC"),Deposit_DESC("`deposit` DESC")
- ,FirstPayDate_ASC("`first_pay_date` ASC"),FirstPayDate_DESC("`first_pay_date` DESC")
,PayDate_ASC("`pay_date` ASC"),PayDate_DESC("`pay_date` DESC")
,IsDel_ASC("`is_del` ASC"),IsDel_DESC("`is_del` DESC")
,MerchantName_ASC("`merchant_name` ASC"),MerchantName_DESC("`merchant_name` DESC")
diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml
index 564a647a7..e565b2827 100644
--- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml
@@ -14,7 +14,6 @@
-
@@ -27,7 +26,7 @@
- `id`,`merchant_id`,`price`,`rental_start_date`,`rental_end_date`,`sign_date`,`receive_period`,`tenant_id`,`filepath`,`status`,`contract_number`,`deposit`,`first_pay_date`,`pay_date`,`is_del`,`merchant_name`,`brand`,`business_id`,`shop_type`,`shop_id`,`updatetime`,`createtime`
+ `id`,`merchant_id`,`price`,`rental_start_date`,`rental_end_date`,`sign_date`,`receive_period`,`tenant_id`,`filepath`,`status`,`contract_number`,`deposit`,`pay_date`,`is_del`,`merchant_name`,`brand`,`business_id`,`shop_type`,`shop_id`,`updatetime`,`createtime`
@@ -44,7 +43,6 @@
and `status` = #{status}
and `contract_number` = #{contractNumber}
and `deposit` = #{deposit}
- and `first_pay_date` = #{firstPayDate}
and `pay_date` = #{payDate}
and `is_del` = #{isDel}
and `merchant_name` = #{merchantName}