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

tangxiaobao

2021-09-06 5fc3fd7cbad93a8bc4a0d13f8217d4e2642450df

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -5350,7 +5350,7 @@
     * @param circleTopicAppDTO 请求参数
     * @return  删除结果
     */
    @PostMapping("/neighbor/circleTopicAppDTO")
    @PostMapping("/neighbor/deleteNeighborByApp")
    R deleteNeighborByApp(@RequestBody DeleteNeighborCircleAppDTO circleTopicAppDTO);

    /**