Merge remote-tracking branch 'origin/dev_SaaS20220301' into dev_SaaS20220301

server/src/main/java/com/pica/cloud/account/account/server/mapper/PermissionDoctorRoleMapper.java

@@ -2,6 +2,7 @@ package com.pica.cloud.account.account.server.mapper;
 
 
 import com.pica.cloud.account.account.server.entity.PermissionDoctorRole;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -36,5 +37,5 @@ public interface PermissionDoctorRoleMapper {
 
     List<PermissionDoctorRole> queryDoctorMenu(Integer doctorId);
 
-    PermissionDoctorRole selectByHospitalIdRoleId(Integer hospitalId, Integer roleId);
+    PermissionDoctorRole selectByHospitalIdRoleId(@Param("hospitalId") Integer hospitalId,@Param("roleId")  Integer roleId);
 }
\ No newline at end of file