diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml
index 43c5751e3..bf291be37 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml
@@ -21,10 +21,10 @@
     <select id="selectById"  resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"></include>
-        from hy_open_area_info where id = #{id}
+        from xfsg_open_area_info where id = #{id}
     </select>
     <insert id="insertSelective"  parameterType="com.cool.store.entity.HyOpenAreaInfoDO" keyProperty="record.id" useGeneratedKeys="true">
-        insert into hy_open_area_info
+        insert into xfsg_open_area_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="record.parentId != null">
                 parent_id,
@@ -91,7 +91,7 @@
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective">
-        update hy_open_area_info
+        update xfsg_open_area_info
         <set>
             <if test="record.parentId != null">
                 parent_id = #{record.parentId},
@@ -130,7 +130,7 @@
 
 
     <update id="batchUpdateById">
-        update hy_open_area_info
+        update xfsg_open_area_info
         <set>
             <if test="backgroundBanner != null">
                 background_banner = #{backgroundBanner},
@@ -157,7 +157,7 @@
 
 
     <update id="batchUpdateByParentId">
-        update hy_open_area_info
+        update xfsg_open_area_info
         <set>
             <if test="backgroundBanner != null">
                 background_banner = #{backgroundBanner},
@@ -183,7 +183,7 @@
 
     <select id="queryKeyOpenArea" resultMap="BaseResultMap">
         select * from
-        hy_open_area_info
+        xfsg_open_area_info
         where area_status = 'keyOpen'
         and province_city_flag = 1
         and parent_id is not null
@@ -191,7 +191,7 @@
 
     <select id="queryByKeyword" resultMap="BaseResultMap">
         select * from
-        hy_open_area_info
+        xfsg_open_area_info
         <where>
             <if test="keyword!=null and keyword!=''">
                 and area_path like  concat('%',#{keyword},'%')
@@ -211,13 +211,13 @@
 
     <select id="queryFirstLevel" resultMap="BaseResultMap">
         select * from
-        hy_open_area_info where parent_id is null
+        xfsg_open_area_info where parent_id is null
     </select>
 
 
     <select id="queryByIdsExcludeFirstLevel" resultMap="BaseResultMap">
         select * from
-        hy_open_area_info where parent_id is not null
+        xfsg_open_area_info where parent_id is not null
         <if test="ids !=null and ids.size>0">
             <foreach collection="ids" item="id" open="and id in (" close=")" separator=",">
                 #{id}
@@ -229,7 +229,7 @@
 
     <select id="getChildrenList" resultMap="BaseResultMap">
         select * from
-        hy_open_area_info
+        xfsg_open_area_info
         <where>
             <if test="parentId!=null">
                 and parent_id = #{parentId}
@@ -239,7 +239,7 @@
 
     <select id="getChildrenCount" resultType="java.lang.Integer">
         select count(1) from
-        hy_open_area_info
+        xfsg_open_area_info
         <where>
             <if test="parentId!=null">
                 and parent_id = #{parentId}
@@ -256,7 +256,7 @@
     <select id="selectByIds" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"></include>
-        from hy_open_area_info
+        from xfsg_open_area_info
         <where>
             <if test="idList !=null and idList.size>0">
                 <foreach collection="idList" item="id" open="and id in (" close=")" separator=",">
@@ -267,38 +267,38 @@
     </select>
 
     <select id="getAllOpenArea" resultMap="BaseResultMap">
-        select <include refid="Base_Column_List"/> from hy_open_area_info
+        select <include refid="Base_Column_List"/> from xfsg_open_area_info
     </select>
 
     <select id="filterLeafNode" resultType="long">
         select
         id
         from
-        hy_open_area_info
+        xfsg_open_area_info
         where
         deleted = '0' and province_city_flag = '0' and id in <foreach collection="openAreaIds" item="openAreaId" separator="," open="(" close=")">#{openAreaId}</foreach>
     </select>
     <select id="getSonArea" resultType="com.cool.store.entity.HyOpenAreaInfoDO">
         SELECT
         <include refid="Base_Column_List"></include>
-        FROM hy_open_area_info
+        FROM xfsg_open_area_info
         WHERE parent_id = #{id}
     </select>
     <select id="getProvinceAllCode"   resultMap="BaseResultMap">
-        SELECT  b.* FROM `hy_open_area_info` a  inner join  hy_open_area_info b    on a.`id`=b.`parent_id`
+        SELECT  b.* FROM `xfsg_open_area_info` a  inner join  xfsg_open_area_info b    on a.`id`=b.`parent_id`
         WHERE a.parent_id=#{id}  ORDER BY  b.id desc
     </select>
     <select id="selectByAreaPath" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"></include>
-        FROM `hy_open_area_info`
+        FROM `xfsg_open_area_info`
         WHERE  area_path= concat('/',#{areaPath},'/')  and deleted=0 and province_city_flag=0
     </select>
 
     <select id="selectAllCity" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"></include>
-        FROM `hy_open_area_info`
+        FROM `xfsg_open_area_info`
         WHERE deleted=0 and province_city_flag = 1 and parent_id is not null
     </select>
 
diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelGroupMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelGroupMapper.xml
index 605df6fd1..9f7eb5939 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelGroupMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelGroupMapper.xml
@@ -20,14 +20,14 @@
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />
-    from hy_partner_label_group
+    from xfsg_partner_label_group
     where id = #{id}
     order by create_time
   </select>
 
   <select id="selectSelective" resultType="com.cool.store.entity.HyPartnerLabelGroupDO">
     select <include refid="Base_Column_List"></include>
-    from hy_partner_label_group
+    from xfsg_partner_label_group
     where deleted = 0
     <if test="labelGroupName != null and labelGroupName != ''">
       and label_group_name = #{labelGroupName}
@@ -57,7 +57,7 @@
   </select>
 
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from hy_partner_label_group
+    delete from xfsg_partner_label_group
     where id = #{id}
     <if test="id != null">
       and id = #{id}
@@ -88,7 +88,7 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.cool.store.entity.HyPartnerLabelGroupDO">
-    insert into hy_partner_label_group (id, label_group_name, deleted, 
+    insert into xfsg_partner_label_group (id, label_group_name, deleted, 
       edit_user_id, edit_date, create_time, 
       update_time, create_user_id, update_user_id, 
       remark)
@@ -98,7 +98,7 @@
       #{remark})
   </insert>
   <insert id="insertSelective" parameterType="com.cool.store.entity.HyPartnerLabelGroupDO">
-    insert into hy_partner_label_group
+    insert into xfsg_partner_label_group
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
         id,
@@ -165,7 +165,7 @@
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.cool.store.entity.HyPartnerLabelGroupDO">
-    update hy_partner_label_group
+    update xfsg_partner_label_group
     <set>
       <if test="labelGroupName != null">
         label_group_name = #{labelGroupName},
@@ -198,7 +198,7 @@
     where id = #{id}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.cool.store.entity.HyPartnerLabelGroupDO">
-    update hy_partner_label_group
+    update xfsg_partner_label_group
     set label_group_name = #{labelGroupName},
       deleted = #{deleted},
       edit_user_id = #{editUserId},
@@ -214,7 +214,7 @@
   <!-- 获取标签分组信息列表 -->
   <select id="getLabelGroupList" resultType="com.cool.store.vo.LabelGroupListVo">
     SELECT  t1.id, t1.label_group_name, t2.`name` AS editName, t2.mobile AS editMobile, t1.edit_date
-    FROM hy_partner_label_group t1
+    FROM xfsg_partner_label_group t1
     LEFT JOIN enterprise_user t2 ON t1.edit_user_id = t2.user_id
     WHERE t1.deleted = 0
     <if test="labelGroupName != null and labelGroupName != ''">
@@ -225,7 +225,7 @@
 
   <select id="getLabelGroupListOrder" resultType="com.cool.store.vo.LabelGroupListVo">
     SELECT  t1.id, t1.label_group_name, t2.`name` AS editName, t2.mobile AS editMobile, t1.edit_date
-    FROM hy_partner_label_group t1
+    FROM xfsg_partner_label_group t1
     LEFT JOIN enterprise_user t2 ON t1.edit_user_id = t2.user_id
     WHERE t1.deleted = 0
     <if test="labelGroupName != null and labelGroupName != ''">
diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelMapper.xml
index 1aa6f475b..d7773f9a4 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelMapper.xml
@@ -21,7 +21,7 @@
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />
-    from hy_partner_label
+    from hxfg_partner_label
     where deleted = 0
     and id = #{id}
     order by create_time desc
@@ -29,7 +29,7 @@
 
   <select id="selectSelective" resultType="com.cool.store.entity.HyPartnerLabelDO">
     select <include refid="Base_Column_List"></include>
-    from hy_partner_label
+    from hxfg_partner_label
     where deleted = 0
     <if test="labelGroupId != null">
       and label_group_id = #{labelGroupId}
@@ -62,11 +62,11 @@
   </select>
 
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from hy_partner_label
+    delete from hxfg_partner_label
     where id = #{id}
   </delete>
   <insert id="insert" parameterType="com.cool.store.entity.HyPartnerLabelDO">
-    insert into hy_partner_label (id, label_group_id, label_name, 
+    insert into hxfg_partner_label (id, label_group_id, label_name, 
       edit_user_id, edit_date, deleted, 
       create_time, update_time, create_user_id, 
       update_user_id, remark)
@@ -76,7 +76,7 @@
       #{updateUserId}, #{remark})
   </insert>
   <insert id="insertSelective" parameterType="com.cool.store.entity.HyPartnerLabelDO">
-    insert into hy_partner_label
+    insert into hxfg_partner_label
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
         id,
@@ -149,7 +149,7 @@
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.cool.store.entity.HyPartnerLabelDO">
-    update hy_partner_label
+    update hxfg_partner_label
     <set>
       <if test="labelGroupId != null">
         label_group_id = #{labelGroupId},
@@ -186,7 +186,7 @@
     and id = #{id}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.cool.store.entity.HyPartnerLabelDO">
-    update hy_partner_label
+    update hxfg_partner_label
     set label_group_id = #{labelGroupId},
       label_name = #{labelName},
       edit_user_id = #{editUserId},
@@ -202,8 +202,8 @@
 
   <select id="getLabelList" resultType="com.cool.store.vo.LabelListVo">
     SELECT t1.id, t2.id AS labelGroupId, t1.label_name, t2.label_group_name, t3.`name` AS editName, t3.mobile AS editMobile, t1.edit_date,t1.create_time as labelCreateTime,t2.create_time AS groupCreateTime
-      FROM hy_partner_label t1
-      LEFT JOIN hy_partner_label_group t2 ON t1.label_group_id = t2.id
+      FROM hxfg_partner_label t1
+      LEFT JOIN hxfg_partner_label_group t2 ON t1.label_group_id = t2.id
       LEFT JOIN enterprise_user t3 ON t1.edit_user_id = t3.user_id
       WHERE t1.deleted = 0 AND t2.deleted = 0
       <if test="labelName != null and labelName != ''">
@@ -217,13 +217,13 @@
 
   <select id="whetherGroupInUse" resultType="java.lang.Boolean">
     SELECT COUNT(*)
-      FROM hy_partner_label
+      FROM hxfg_partner_label
       WHERE deleted = 0
       AND label_group_id = #{labelGroupId}
   </select>
 
   <select id="getLabelListByIds" resultMap="BaseResultMap">
-    select * from hy_partner_label where deleted = 0
+    select * from hxfg_partner_label where deleted = 0
     <if test="labelIds!=null and labelIds.size>0">
       <foreach collection="labelIds" item="labelId" open="and id in (" close=")" separator=",">
         #{labelId}
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLabelDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLabelDO.java
index 6dc765b14..19ae9f1ff 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLabelDO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLabelDO.java
@@ -22,7 +22,7 @@ public class HyPartnerLabelDO {
     @ApiModelProperty("")
     private Long id;
 
-    @ApiModelProperty("标签组id hy_partner_label_group.id")
+    @ApiModelProperty("标签组id xfsg_partner_label_group.id")
     private Long labelGroupId;
 
     @ApiModelProperty("标签名")
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java b/coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java
index c7de64fd1..1ab22caa8 100644
--- a/coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java
@@ -121,7 +121,7 @@ public class TokenValidateFilter implements Filter {
 //        }
 //        try {
 //            CurrentUserHolder.setUser(userStr);
-//            filterChain.doFilter(servletRequest, servletResponse);
+            filterChain.doFilter(servletRequest, servletResponse);
 //        } finally {
 //            CurrentUserHolder.removeUser();
 //            MDC.clear();