Merge branch 'develop' of https://gitlab.dituhui.com/bsh/project/project into develop

project-user/src/main/java/com/dituhui/pea/user/dao/UserDao.java

 package com.dituhui.pea.user.dao;
 package com.dituhui.pea.user.dao;
 
 
 
 
-import com.dituhui.pea.user.entity.UserEntity;
+import java.util.List;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.CrudRepository;
 
 
-import java.util.List;
-import java.util.Optional;
+import com.dituhui.pea.user.entity.UserEntity;
 
 
 /**
 /**
  * 用户表(User)表数据库访问层
  * 用户表(User)表数据库访问层
@@ -47,20 +47,6 @@ public interface UserDao extends JpaRepository<UserEntity, String>,
     List<UserEntity> findByWechatMiniProgram(String wechatMiniProgram);
     List<UserEntity> findByWechatMiniProgram(String wechatMiniProgram);
 
 
     /**
     /**
-     * 根据qq查询
-     * @param qq
-     * @return
-     */
-    List<UserEntity> findByQq(String qq);
-
-    /**
-     * 根据微博查询
-     * @param weibo 微博
-     * @return
-     */
-    Optional<UserEntity> findByWeibo(String weibo);
-
-    /**
      * 根据账号查询
      * 根据账号查询
      * @param account 账号
      * @param account 账号
      * @return
      * @return