diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java
index cbdcdb2..ba1d76f 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java
@@ -125,8 +125,7 @@ public class LoginContoller {
 //        try{
 //            String data = WxMaCryptUtils.decrypt(sessionKey, encryptedData, ivStr);
 //            if (ObjectUtil.isNotEmpty(data) && JSONObject.parseObject(data).containsKey("phoneNumber")) {
-//                phone =JSONObject.parseObject(data).get("phoneNumber").toString();
-//            }
+//            }//                phone =JSONObject.parseObject(data).get("phoneNumber").toString();
 //        }catch (Exception e){
 //            log.info("登录传参：获取手机号失败{}",e.getMessage());
 //        }
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/UserContoller.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/UserContoller.java
index 2908836..8f130ae 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/UserContoller.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/UserContoller.java
@@ -102,6 +102,7 @@ public class UserContoller {
             shopUser.setAmount(BigDecimal.ZERO);
         }
         if (tbShopInfo != null) {
+            shopUser.setIsUser(tbShopInfo.getIsCustom());
             shopUser.setShopName(tbShopInfo.getShopName());
         }else {
             shopUser.setShopName("");
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopInfo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopInfo.java
index 2d8b7e9..4e94053 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopInfo.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopInfo.java
@@ -111,6 +111,8 @@ public class TbShopInfo implements Serializable {
     private String cities;
     private String districts;
 
+    private String isCustom;
+
     private static final long serialVersionUID = 1L;
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopUser.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopUser.java
index 9531fdf..684c484 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopUser.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopUser.java
@@ -1,5 +1,7 @@
 package com.chaozhanggui.system.cashierservice.entity;
 
+import org.springframework.data.annotation.Transient;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 
@@ -65,6 +67,14 @@ public class TbShopUser implements Serializable {
     private String miniOpenId;
     private String shopName;
 
+    @Transient
+    private String isUser;
+
+
+
+
+
+
     private static final long serialVersionUID = 1L;
 
     public String getId() {
@@ -307,4 +317,12 @@ public class TbShopUser implements Serializable {
     public void setMiniOpenId(String miniOpenId) {
         this.miniOpenId = miniOpenId == null ? null : miniOpenId.trim();
     }
+
+    public String getIsUser() {
+        return isUser;
+    }
+
+    public void setIsUser(String isUser) {
+        this.isUser = isUser;
+    }
 }
\ No newline at end of file
diff --git a/src/main/resources/mapper/TbShopInfoMapper.xml b/src/main/resources/mapper/TbShopInfoMapper.xml
index 47dc761..9844f1a 100644
--- a/src/main/resources/mapper/TbShopInfoMapper.xml
+++ b/src/main/resources/mapper/TbShopInfoMapper.xml
@@ -52,6 +52,8 @@
         <result column="provinces" jdbcType="VARCHAR" property="provinces"/>
         <result column="cities" jdbcType="VARCHAR" property="cities"/>
         <result column="districts" jdbcType="VARCHAR" property="districts"/>
+
+        <result column="is_custom" jdbcType="VARCHAR" property="isCustom" />
     </resultMap>
     <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs"
                type="com.chaozhanggui.system.cashierservice.entity.TbShopInfo">
@@ -64,7 +66,7 @@
     detail, lat, lng, mch_id, register_type, is_wx_ma_independent, address, city, type, 
     industry, industry_name, business_start_day,business_end_day,business_time, post_time, post_amount_line, on_sale, settle_type,
     settle_time, enter_at, expire_at, status, average, order_wait_pay_minute, support_device_number,
-    distribute_level, created_at, updated_at, proxy_id, shop_qrcode, tag,is_open_yhq,is_use_vip,provinces,cities,districts
+    distribute_level, created_at, updated_at, proxy_id, shop_qrcode, tag,is_open_yhq,is_use_vip,provinces,cities,districts,is_custom
     </sql>
     <sql id="Blob_Column_List">
         view
diff --git a/src/main/resources/mapper/TbUserInfoMapper.xml b/src/main/resources/mapper/TbUserInfoMapper.xml
index d42bf03..7f5ec68 100644
--- a/src/main/resources/mapper/TbUserInfoMapper.xml
+++ b/src/main/resources/mapper/TbUserInfoMapper.xml
@@ -50,6 +50,7 @@
     <result column="password" jdbcType="VARCHAR" property="password" />
     <result column="is_pwd" jdbcType="VARCHAR" property="isPwd" />
     <result column="pwd" jdbcType="VARCHAR" property="pwd" />
+
   </resultMap>
   <sql id="Base_Column_List">
     id, amount, charge_amount, line_of_credit, consume_amount, consume_number, total_score,