Merge remote-tracking branch 'origin/busUser' into busUser

# Conflicts:
#	api-admin/src/main/java/com/glxp/sale/admin/dao/auth/UserRegisterDao.java

api-admin/src/main/java/com/glxp/sale/admin/dao/auth/UserRegisterDao.java

@@ -19,7 +19,7 @@ public interface UserRegisterDao {
 
     UserRegisterEntity selectById(Integer id);
 
-    UserRegisterEntity selectByCustomerId(String id);
+    UserRegisterEntity selectByCustomerId(Long id);
 
     UserRegisterEntity selectByMobile(String phone);
 

api-admin/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml

@@ -86,7 +86,7 @@
         WHERE mobile = #{phone}
     </select>
 
-    <select id="selectByCustomerId" parameterType="java.lang.String"
+    <select id="selectByCustomerId" parameterType="java.lang.Long"
             resultType="com.glxp.sale.admin.entity.auth.UserRegisterEntity">
         SELECT *
         FROM user_register