Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real

mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java

@@ -93,6 +93,7 @@ public class WxMerchantBUserController extends BaseController {
         resultMap.put("parent_tenant_id",merchant.getParentTenantId());
         resultMap.put("phone", user.getPhone());
         resultMap.put("name", user.getName());
+        resultMap.put("user_is_admin", user.getIsAdmin());
         resultMap.put("merchant_name", merchant.getName());
         resultMap.put("merchant_img_url", merchant.getImgUrl());
         resultMap.put("mall_name", mall.getName());