Merge branch 'test' into 'master'

罗yu 元桥

2021-05-08 20a4680b5c85a1e0abd55f585949f6bc35fac086

Merge branch 'test' into 'master'

创建订单返回订单

See merge request root/zhihuishequ!12

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

@@ -93,8 +93,10 @@
    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 " +
            " 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);