Merge remote-tracking branch 'origin/master'

xuhy

2025-03-07 193945d70b561bc96bb608b47b9b2e4dba3b45b2

 ruoyi-system/src/main/java/com/ruoyi/system/query/SysUserQuery.java

@@ -12,10 +12,10 @@
public class SysUserQuery extends BasePage {

    @ApiModelProperty(value = "姓名")
    private String nickNameAndPhone;
    private String nickNameOrPhone;

    @ApiModelProperty(value = "角色id")
    private Integer roleId;
    private List<Integer> roleIds;

    @ApiModelProperty(value = "部门id集合")
    private List<String> deptIds;