合并冲突解决

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -250,8 +250,8 @@ public class SysUserController extends BaseController
      * @return
      */
     @Anonymous
-    @GetMapping("/generateUserSign")
-    public AjaxResult generateUserSign(@RequestParam(required = true) Long userId){
+    @GetMapping("/selectUserById")
+    public AjaxResult selectUserById(@RequestParam(required = true) Long userId){
         return AjaxResult.success(userService.selectUserById(userId));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java

@@ -388,4 +388,15 @@ public class CaseApplicationController extends BaseController {
         caseApplicationService.destroyRoomBack(body,request);
         return success();
     }
+    /**
+     * 根据案件id查询已预约的会议
+     * @param caseId
+     * @return
+     */
+    @Anonymous
+    @GetMapping("/reserveConferenceList")
+    public AjaxResult reserveConferenceList(  @RequestParam("caseId") Long caseId) {
+
+        return  success(caseApplicationService.reserveConferenceList(caseId));
+    }
 }