Merge branch 'fixbug/conflicts' into 'master'

bug: [none] 解决冲突

See merge request rays/pcloud-book!1262

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/facade/RightsSettingFacede.java

@@ -421,13 +421,6 @@ public class RightsSettingFacede {
         return new ResponseDto<>(rightsSettingBiz.getAllRightsClassifyNew());
     }
 
-    @ApiOperation("处理权益模块旧数据")
-    @PostMapping("handleRightsSettingOld")
-    public ResponseDto<?> handleRightsSettingOld(@RequestBody List<Long> rightsSettingIdList){
-        rightsSettingBiz.handleRightsSettingOld(rightsSettingIdList);
-        return new ResponseDto<>();
-    }
-
     @ApiOperation("小程序本书服务页 - 获取是否配置了读书卡片")
     @GetMapping("/getBookCardId4Book")
     public ResponseDto<Map<String,Object>> getBookCardId4Book(@RequestParam("bookId") Long bookId,