Merge branch 'test' into 'test_screen'

罗元桥

2021-06-22 c6512655e722d9ca80dd8c34b79f6d3923ecf86c

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

@@ -47,7 +47,7 @@
            "ORDER BY\n" +
            "distance ASC" +
            "<if test='lng != null and lng.trim() != &quot;&quot;'>" +
            " limit 10 " +
            " limit 100 " +
            " </if> " +
            "</script>")
    List<ComActVO> listCommunity(ComActVO comActVO);
@@ -73,6 +73,7 @@
            "AND #{pageComActDTO.createAtEnd}" +
            " </if> " +
            " </where>" +
            " order by a.create_at desc"+
            "</script>")
    IPage<ComActVO> pageCommunity(Page page, @Param("pageComActDTO") PageComActDTO pageComActDTO);
    @Update("update sys_user u set u.password=#{password} where u.account=#{account} and u.type=3 and u.community_id=#{communityId}")