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 5996bae1a..5b6f9a4d1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -437,7 +437,7 @@ public class WxRentContract extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "到期提醒手机号", name = "outDateNotifyPhone") private String outDateNotifyPhone; - @io.swagger.annotations.ApiModelProperty(value = "到期提醒手机号", name = "outDateNotifyPhone") + @io.swagger.annotations.ApiModelProperty(value = "设计文件", name = "outDateNotifyPhone") private String designFile; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index dc442f4b2..f1c9afffd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1944,10 +1944,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { //保存营业管理费账单 savePreviewManageFeeBill(wxRentContract,EnumRentContractManageFeeType.RENT_OPERATING_MANAGE_FEE); } -// ResultData resultData = getResultDataForUpdate(record, userId,0,oldRentStartDate,writeComplate); -// if (resultData.code != Result.SUCCESS) { -// return resultData; -// } WxRentContract rc = new WxRentContract(); rc.setId(record.getId()); rc.setRentalStartDate(oldRentStartDate); @@ -1957,6 +1953,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { }else { rc.setStatus(wxRentContract.getStatus()); } + rc.setRemark(record.getRemark()); + rc.setFileNames(record.getFileNames()); wxRentContractMapper.updateById(rc); return new ResultData(wxRentContract); }