From c35d760b351c26f296e5616459c6a62862a49a2f Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 23 Jul 2020 10:51:27 +0800 Subject: [PATCH 1/2] jiekouui --- .../iformall/controller/basic/WxProjectConfigController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java index 9cf85734b..2c03784f4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java @@ -13,6 +13,7 @@ import com.iformall.enums.EnumUserAdmin; import com.iformall.service.*; import com.iformall.shiro.PasswordHelper; import com.iformall.sms.EnumSMSChannel; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -24,6 +25,7 @@ import org.springframework.web.bind.annotation.*; import java.util.*; @RestController +@Api(description = "初始化相关接口") @RequestMapping("wxProjectConfig") public class WxProjectConfigController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); From e297f06943046e983664c7b1f401abc74531715b Mon Sep 17 00:00:00 2001 From: furunxin <864795252@qq.com> Date: Thu, 23 Jul 2020 10:51:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=BB=AD=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/contract/WxRentContractExtensionController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractExtensionController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractExtensionController.java index 941099e39..f14e20a26 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractExtensionController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractExtensionController.java @@ -139,6 +139,6 @@ public class WxRentContractExtensionController extends BaseController { if(wxRentContract.getRentStartType()!=null && wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); } - return wxRentContractService.updateFile(wxRentContract, user.getId(),user.getName(),oldDate); + return wxRentContractService.extensionUpdateFile(wxRentContract, user.getId(),user.getName(),oldDate); } }