Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-20 26cd8c7b2bc7a725a3de28d3ed883a6f54da84f1

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsHouseDAO.java

@@ -23,7 +23,7 @@
   @Select("select type,name,phone,image_url from sys_user where user_id=#{userId}")
   LoginUserInfoVO selectUserByUserId(Long userId);

   @Select("select user_id from sys_user where user_id=#{name}  limit 1")
   @Select("select user_id from sys_user where name like concat('%',#{name},'%')  limit 1")
   Long selectUserIdByName(String name);

   @Select("<script> " +