Merge branch 'master' into hemenkou_dev

101captain

2021-12-27 75206d4e4ecd2a7789a21362b85906463d3f2c3d

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSwPatrolRecordApi.java

@@ -288,8 +288,8 @@
     * @return 查询结果
     */
    @GetMapping("/rota/getRotaPersonByDate")
    public R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate) {
        return comSwRotaService.getRotaPersonByDate(rotaDate);
    public R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate,@RequestParam("communityId")Long communityId) {
        return comSwRotaService.getRotaPersonByDate(rotaDate,communityId);
    }

    /**
@@ -298,8 +298,8 @@
     * @return 查询结果
     */
    @GetMapping("/rota/getRotaLeaderByDate")
    public R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate) {
        return comSwRotaService.getRotaLeaderByDate(rotaDate);
    public R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate,@RequestParam("communityId")Long communityId) {
        return comSwRotaService.getRotaLeaderByDate(rotaDate,communityId);
    }

    /**