Merge branch 'test' into 'lyq'

罗元桥

2021-05-25 543aecbc143b113e81c887a3a7ebb72213faf5bd

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

@@ -46,7 +46,7 @@
            "LEFT JOIN com_act_easy_photo_comment_user u1 on m.id=u1.easy_photo_comment_id and u1.user_id=#{comActEasyPhotoCommentDTO.userId}\n" +
            "where m.easy_photo_id=#{comActEasyPhotoCommentDTO.id}  " +
            "GROUP BY m.id\n" +
            " )t order by t.num desc")
            " )t order by t.num desc, t.create_at DESC ")
    IPage<ComActEasyPhotoCommentVO> pageComActEasyPhotoComment(Page page, @Param("comActEasyPhotoCommentDTO") PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO);