Merge remote-tracking branch 'origin/master'

luodangjia

2025-01-14 64934df4bec0b1447b8835371213c5decefb1325

 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;