From 67681825b6c0f55b0bb32e6d5c1169df12f27187 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 28 May 2021 15:53:04 +0800 Subject: [PATCH] tt --- .../java/com/iformall/controller/WxMerchantController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkTTCApi/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkTTCApi/src/main/java/com/iformall/controller/WxMerchantController.java index fadd926cf..fe22e3453 100644 --- a/mallinkTTCApi/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkTTCApi/src/main/java/com/iformall/controller/WxMerchantController.java @@ -41,7 +41,7 @@ public class WxMerchantController extends BaseController { public ResultData list(@ModelAttribute WxMerchantDto wxMerchantDto, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); if (null == wxMerchantDto) wxMerchantDto = new WxMerchantDto(); - wxMerchantDto.updateTenantInfo(getTenantInfo()); +// wxMerchantDto.updateTenantInfo(getTenantInfo()); wxMerchantDto.setMerchantStatus(EnumMerchantStatus.VALID.getCode()); wxMerchantDto.setIsPublic(EnumMerchantPublic.PUBLIC.getCode()); return new ResultData(wxMerchantService.listAsPageCVo(wxMerchantDto, pageNum, pageSize)); @@ -55,7 +55,7 @@ public class WxMerchantController extends BaseController { public ResultData listV1(@ModelAttribute WxMerchant merchant, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); if (null == merchant) merchant = new WxMerchant(); - merchant.updateTenantInfo(getTenantInfo()); +// merchant.updateTenantInfo(getTenantInfo()); merchant.setStatus(EnumMerchantStatus.VALID.getCode()); merchant.setIsPublic(EnumMerchantPublic.PUBLIC.getCode()); return new ResultData(wxMerchantService.listAsPage(merchant, pageNum, pageSize));