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 e69709059..942c04b38 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -403,7 +403,7 @@ public class WxRentContractController extends WxContractBaseController { public ResultData setRevenueSales(@RequestBody WxRentContract wxRentContract) { WxRentContract rentContract = wxRentContractMapper.selectById(wxRentContract.getId()); if (null == rentContract) { - return new ResultData(Result.ERROR, "编号["+wxRentContract.getId()+"]未找到租金合同"); + return new ResultData(Result.ERROR, "编号["+wxRentContract.getId()+"]未找到合同"); } if (null == wxRentContract.getSalesStartTime() || null == wxRentContract.getSalesEndTime()) { return new ResultData(Result.ERROR, "时间不能为空"); @@ -433,7 +433,7 @@ public class WxRentContractController extends WxContractBaseController { public ResultData setContractYearsSalesConfirm(@RequestBody WxRentContract wxRentContract) { WxRentContract rentContract = wxRentContractMapper.selectById(wxRentContract.getId()); if (null == rentContract) { - return new ResultData(Result.ERROR, "编号["+wxRentContract.getId()+"]未找到租金合同"); + return new ResultData(Result.ERROR, "编号["+wxRentContract.getId()+"]未找到合同"); } rentContract.setYearsBegin(wxRentContract.getYearsBegin()); rentContract.setYearsEnd(wxRentContract.getYearsEnd()); @@ -450,7 +450,7 @@ public class WxRentContractController extends WxContractBaseController { public ResultData calcuteYearsRevenueRentUp(@RequestBody WxRentContract wxRentContract) { WxRentContract rentContract = wxRentContractMapper.selectById(wxRentContract.getId()); if (null == rentContract) { - return new ResultData(Result.ERROR, "编号["+wxRentContract.getId()+"]未找到租金合同"); + return new ResultData(Result.ERROR, "编号["+wxRentContract.getId()+"]未找到合同"); } rentContract.setYearsBegin(wxRentContract.getYearsBegin()); rentContract.setYearsEnd(wxRentContract.getYearsEnd()); diff --git a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml index 9c50793db..61053eb13 100644 --- a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml @@ -434,7 +434,7 @@