diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index 861d65e40..28192f52b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -144,9 +144,6 @@ public class WxRentContractController extends WxContractBaseController { */ @PostMapping("setFreePeriod") public ResultData setFreePeriod(@RequestBody WxRentContract wxRentContract) { - if (null == wxRentContract.getFreePeriods()) { - return new ResultData(Result.ERROR,"免租期不能为空"); - } wxRentContract.updateTenantInfo(getTenantInfo()); wxRentContractService.saveFreePeriods(wxRentContract); return new ResultData(); 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 29fcf2852..982472f74 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -285,9 +285,6 @@ public class WxRentContract extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "计租面积", name = "rentArea") private String rentArea; - - - @io.swagger.annotations.ApiModelProperty(value = "上传文件名", name = "filename") private String filename; @@ -312,6 +309,9 @@ public class WxRentContract extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "联营扣点比率", name = "payRatio") private String payRatio; + + @io.swagger.annotations.ApiModelProperty(value = "联营扣点跳点设置", name = "busDiscountRatio") + private String busDiscountRatio; @io.swagger.annotations.ApiModelProperty(value = "保底营业额", name = "revenue") private String revenue; @@ -324,9 +324,6 @@ public class WxRentContract extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "是否设置保底营业额", name = "revenueRatio") private Integer revenueRatio; - //@io.swagger.annotations.ApiModelProperty(value = "调整比例", name = "adjustRatio") - //private String revenueYear; - @io.swagger.annotations.ApiModelProperty(value = "计租日", name = "startDate") private Date startDate; @@ -418,9 +415,6 @@ public class WxRentContract extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "n日后开始计算滞纳金", name = "latePayDay") private Integer latePayDay; - @io.swagger.annotations.ApiModelProperty(value = "联营扣点跳点设置", name = "busDiscountRatio") - private String busDiscountRatio; - @io.swagger.annotations.ApiModelProperty(value = "查询店铺", name = "queryShopId") @TableField(exist = false) private Long queryShopId;