diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppRegisterServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppRegisterServiceImpl.java
index 4b9a10a..4e06d8a 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppRegisterServiceImpl.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppRegisterServiceImpl.java
@@ -225,7 +225,5 @@ public class AppRegisterServiceImpl implements IAppRegisterService {
     }
 
     public static void main(String[] args) {
-        SendNoteUtil sendNoteUtil = new SendNoteUtil();
-        sendNoteUtil.sendMessage("17647557909");
     }
 }
diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java
index 4309f9a..cb6e400 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java
@@ -217,9 +217,9 @@ public class AppUserDynamicServiceImpl implements IAppUserDynamicService
             appUserCollect.setDynamicId(id);
             appUserCollect.setUserId(appUserDynamic.getAppId());
             List<AppUserCollect> appUserCollects = appUserCollectMapper.selectAppUserCollectList(appUserCollect);
-            if (CollectionUtils.isEmpty(appUserCollects)) {
-                appUserDynamicVo.setIsCollect(1);
-            }
+            appUserDynamicVo.setIsCollect(appUserCollects != null && appUserCollects.size() > 0 ? 0 : 1);
+            /*if (CollectionUtils.isEmpty(appUserCollects)) {
+            }*/
 
             // 评论数
             AppDynamicComment appDynamicComment = new AppDynamicComment();
diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/utils/CrossFilter.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/utils/CrossFilter.java
new file mode 100644
index 0000000..db56404
--- /dev/null
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/utils/CrossFilter.java
@@ -0,0 +1,36 @@
+package com.ruoyi.app.utils;
+
+import org.springframework.stereotype.Component;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * 跨域设置
+ */
+@Component
+public class CrossFilter implements Filter {
+    @Override
+    public void init(FilterConfig filterConfig) throws ServletException {
+
+    }
+
+    @Override
+    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
+        HttpServletResponse response = (HttpServletResponse) servletResponse;
+        HttpServletRequest reqs = (HttpServletRequest) servletRequest;
+        response.setHeader("Access-Control-Allow-Origin",reqs.getHeader("Origin"));
+        response.setHeader("Access-Control-Allow-Credentials", "true");
+        response.setHeader("Access-Control-Allow-Methods", "*");
+        response.setHeader("Access-Control-Max-Age", "3600");
+        response.setHeader("Access-Control-Allow-Headers", "Accept,Origin,X-Requested-With,x_requested_with,Content-Type,Last-Modified,JSESSIONID");
+        filterChain.doFilter(servletRequest, servletResponse);
+    }
+
+    @Override
+    public void destroy() {
+
+    }
+}
\ No newline at end of file
diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppRegisterMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppRegisterMapper.xml
index 9ede39b..8ebd99f 100644
--- a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppRegisterMapper.xml
+++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppRegisterMapper.xml
@@ -26,10 +26,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="major"    column="major"    />
         <result property="companyName"    column="company_name"    />
         <result property="nickname" column="nickname" />
+        <result property="cityId"    column="city_id"    />
+        <result property="provinceId"    column="province_id"    />
+        <result property="townId"    column="town_id"    />
     </resultMap>
 
     <sql id="selectAppRegisterVo">
-        select id, phone, create_time, update_time, create_by, updateBy, remark, username, prove, avatar_url, sex, address, school_id, email ,invitation_code ,status , push_id , education , major , company_name , nickname from app_register
+        select id, phone, create_time, update_time, create_by, updateBy, remark, username, prove, avatar_url, sex, address, school_id, email ,invitation_code ,status , push_id , education , major , company_name , nickname,city_id , province_id , town_id from app_register
     </sql>
 
     <select id="selectAppRegisterList" parameterType="AppRegister" resultMap="AppRegisterResult">
diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml
index aea7c7b..e79ec68 100644
--- a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml
+++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml
@@ -45,6 +45,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="check"    column="check"    />
         <result property="backGroundImg"    column="back_ground_img"    />
         <result property="jobEndTime"    column="job_end_time"    />
+        <result property="cityId"    column="city_id"    />
+        <result property="provinceId"    column="province_id"    />
+        <result property="townId"    column="town_id"    />
     </resultMap>
     <sql id="appUserColumns">
        a.id as "id",
@@ -89,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectAppUserVo">
         select id, username, password, nickname, email,sex, phone, address, create_time, update_time, avatar_url, education, school, major, start_time, end_time, experience, company_name, industry, job_time, job_name, job_type, skill_id, job_content, type,is_member,job_end_time,
-               order_id, order_start_time, order_end_time , `check` , back_ground_img from app_user
+               order_id, order_start_time, order_end_time , `check` , back_ground_img,city_id , province_id , town_id from app_user
     </sql>
 
     <select id="selectAppUserList" parameterType="AppUser" resultMap="AppUserResult">
@@ -186,7 +189,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="companyName != null  and companyName != ''">
             and (a.company_name like concat('%', #{companyName}, '%')
                 or a.username like concat('%', #{companyName}, '%')
-                or s.name like concat('%', #{companyName}, '%')
+            or a.nickname like concat('%', #{companyName}, '%')
+            or a.major like concat('%', #{companyName}, '%')
+            or s.name like concat('%', #{companyName}, '%')
             )
         </if>
         <if test="ids != null and ids.size()"> and a.id not in