Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into qtz3

# Conflicts:
#	ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -132,4 +132,6 @@ public interface SysUserMapper
      * @return 结果
      */
     public SysUser checkEmailUnique(String email);
+
+    List<SysUser> selectUserListByIds(@Param("idList") List<Long> idList);
 }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/ArbitratorMapper.java

@@ -8,4 +8,5 @@ import java.util.List;
 public interface ArbitratorMapper {
     List<Arbitrator> selectArbitratorList(Arbitrator arbitrator);
 
+
 }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseApplicationMapper.java

@@ -1,5 +1,6 @@
 package com.ruoyi.wisdomarbitrate.mapper;
 
+import com.ruoyi.wisdomarbitrate.domain.Arbitrator;
 import com.ruoyi.wisdomarbitrate.domain.CaseAffiliate;
 import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
 import org.apache.ibatis.annotations.Param;
@@ -31,4 +32,11 @@ public interface CaseApplicationMapper {
      * @return
      */
     Integer selectCaseNumLike(@Param("caseNum") String caseNum, @Param("length") int length);
+
+    /**
+     * 查询仲裁员根据案件id
+     * @param arbitrator
+     * @return
+     */
+    String selectArbitratorList(@Param("id") String id);
 }