Merge branch 'test' into 'master'

罗yu 元桥

2021-04-30 1abee89cd55e34fc51102d23f984e3d56ed01647

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

@@ -41,9 +41,10 @@
   void updatePublic(@Param("ispublic") Integer ispublic,@Param("id") Long id);
   
   @Select("<script> " +
            "SELECT * \n" +
            "SELECT t.id,t.msg_content,t.photo_pah,t.phone,t.sendto_user_id,t.sendto_user_name,t.status,t.ispublic," +
         "t.user_id,t.user_account,t.user_name,t.user_phone,t.community_id,t.create_at,t.type, u.phone as userAccount \n" +
            "FROM \n" +
            " com_act_message t " +
            " com_act_message t LEFT JOIN sys_user u ON t.user_id = u.user_id " +
         " where t.community_id=#{comActMessageVO.communityId}\n" +
            "<if test='comActMessageVO.userAccount != null and comActMessageVO.userAccount.trim() != &quot;&quot;'>" +
            " and t.user_account=#{comActMessageVO.userAccount} \n" +