Merge branch 'test' into 'master'

罗元桥

2021-07-15 2b020ad1e07a91524b496069e1a604b92ebbd7a3

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

@@ -120,13 +120,22 @@
    R detailActivity(@RequestParam("id") Long id, @RequestParam("userId") Long userId);

    /**
     * 活动报名名单
     * 分页活动报名名单
     *
     * @param activitySignVO 查询参数
     * @return 报名人员集合
     */
    @PostMapping("listactivitysign")
    R listActivitySign(@RequestBody ActivitySignVO activitySignVO);

    /**
     * 活动报名名单
     *
     * @param activitySignVO 查询参数
     * @return 报名人员集合
     */
    @PostMapping("listactivitysigns")
    R listActivitySigns(@RequestBody ActivitySignVO activitySignVO);

    /**
     * 新增社区动态
@@ -1427,6 +1436,15 @@
    R listSaveMngCarExcelVO(@RequestBody List<ComMngCarExcelVO> list, @RequestParam("communityId") Long communityId);

    /**
     * 车辆导出
     *
     * @param exportComMngCarExcelDTO
     * @return
     */
    @PostMapping("/common/data/car/export")
    R exportRealCar(ExportComMngCarExcelDTO exportComMngCarExcelDTO);

    /**
     * 社区后台实有单位管理列表
     *
     * @param pageComMngRealCompanyDTO