Merge remote-tracking branch 'origin/master'

xuhy

2025-01-17 3cb59ae9ddc31e62988e5c7feb6647b44f1c7cf8

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/dto/WithQuery.java

@@ -8,10 +8,10 @@
@Data
public class WithQuery {
    @ApiModelProperty("用户名称")
    private String name;
    private String userName;

    @ApiModelProperty("电话")
    private String phone;
    private String userPhone;
    private Integer pageNum;
    private Integer pageSize;