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

CeDo

2021-05-10 4fc44644c4a7bf9f0770a95ddbdad466c2743cb4

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

@@ -93,9 +93,11 @@
    AdministratorsUserVO selectUserByUserId(@Param("userId") Long userId);

    @Select("<script> " +
            "select id,release_content,release_images,status,create_at,comment_num,fabulous_num,forward_num,views_num,refuse_reason " +
            "select canc.id,canc.release_content,canc.release_images,canc.status,canc.create_at" +
            ",canc.comment_num,canc.fabulous_num,canc.forward_num,canc.views_num,canc.refuse_reason,su.nick_name as name,su.image_url as headUrl " +
            " from com_act_neighbor_circle as canc " +
            " where canc.release_id = #{userId} order by create_at desc" +
            " left join sys_user as su on su.user_id = canc.release_id " +
            " where canc.release_id = #{userId} and canc.status != 3 order by create_at desc" +
            " </script>")
    IPage<ComActNeighborCircleAppVO> neighborExamineByApp(Page page,@Param("userId") Long userId);