Merge branch 'zhaozhengjie1104' into test

101captain

2021-11-23 d104cd36001c06fbbdd473a3a8b46d14ae53c900

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

@@ -5351,7 +5351,7 @@
     * @return 查询结果
     */
    @GetMapping("/patrolRecord/rota/getRotaPersonByDate")
    R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate);
    R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate,@RequestParam("communityId")Long communityId);

    /**
     * 根据日期查询值班领导
@@ -5359,7 +5359,7 @@
     * @return 查询结果
     */
    @GetMapping("/patrolRecord/rota/getRotaLeaderByDate")
    R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate);
    R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate,@RequestParam("communityId")Long communityId);

    /**
     * 批量导入值班表
@@ -5524,6 +5524,8 @@
    @PostMapping("/reserve/commit")
    R reserveCommit(@RequestBody ComActReserveCommitVO comActReserveCommitVO);

    @PostMapping("/reserve/commitNoToken")
    R reserveCommitNoToken(@RequestBody ComActReserveCommitVO comActReserveCommitVO);
    /**
     * 我的预约/登记
     * @param pageUserReserveDTO