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

huanghongfa

2021-04-28 43c6e133a84d50f4952cd1df2f409d07be338cc4

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

@@ -42,8 +42,9 @@
   
   @Select("<script> " +
            "SELECT * \n" +
            "FROM\n" +
            "com_act_message t where t.community_id=#{comActMessageVO.communityId}\n" +
            "FROM \n" +
            " com_act_message t " +
         " 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" +
            " </if> " +