From 72ea4eb9ca3d1a8d43016b04676172fd9eb9db30 Mon Sep 17 00:00:00 2001 From: hanxueda Date: Thu, 18 Apr 2019 17:55:53 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E6=88=B7][=E6=96=B0=E5=A2=9E]:B?= =?UTF-8?q?=E7=AB=AF=E6=B7=BB=E5=8A=A0=E6=98=AF=E5=90=A6=E5=95=86=E7=AE=A1?= =?UTF-8?q?=E5=95=86=E6=88=B7=E5=AD=97=E6=AE=B5=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxMerchantBUserController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java index ac0adbeb4..7481119af 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java @@ -4,7 +4,9 @@ package com.iformall.controller; import com.iformall.annotation.AuthIgnore; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; -import com.iformall.domain.po.*; +import com.iformall.domain.po.WxMall; +import com.iformall.domain.po.WxMerchant; +import com.iformall.domain.po.WxMerchantBUser; import com.iformall.enums.EnumMerchantBUserStatus; import com.iformall.enums.EnumMerchantStatus; import com.iformall.service.*; @@ -24,7 +26,6 @@ import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; import java.util.Date; import java.util.HashMap; -import java.util.List; import java.util.Map; @RestController @@ -81,6 +82,7 @@ public class WxMerchantBUserController extends BaseController { resultMap.put("service_phone", mall.getServicePhone()); resultMap.put("tenant_id",merchant.getTenantId()); resultMap.put("merchant_id",merchant.getId()); + resultMap.put("is_admin",merchant.getIsAdmin()); String mid = null; try { mid = String.valueOf(merchant.getId());