根据角色权限查找人员优化

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/result/SysUserResult.java

@@ -40,8 +40,6 @@ public class SysUserResult implements Serializable {
 
     @ApiModelProperty(value = "角色id集合")
     private String roleIds;
-<<<<<<< HEAD
-=======
 
     public String getRoleIds() {
         return roleIds;
@@ -50,7 +48,6 @@ public class SysUserResult implements Serializable {
     public void setRoleIds(String roleIds) {
         this.roleIds = roleIds;
     }
->>>>>>> dev_v3.2.2
 
     public Long getId() {
         return id;