From b876f27c592c5d44e4b32b79d4ef4bc25fe88603 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期日, 20 七月 2025 15:21:04 +0800
Subject: [PATCH] Merge branch 'huliguo' of http://120.76.84.145:10101/gitblit/r/java/ZhengShengXinAdmin into huliguo
---
ruoyi-system/src/main/java/com/ruoyi/system/pojo/dto/AppUserPageDTO.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/pojo/dto/AppUserPageDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/pojo/dto/AppUserPageDTO.java
index 550bed8..9d52757 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/pojo/dto/AppUserPageDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/pojo/dto/AppUserPageDTO.java
@@ -15,7 +15,7 @@
@ApiModelProperty("分页大小")
private Integer pageSize=10;
@ApiModelProperty("用户姓名")
- private String username;
+ private String userName;
@ApiModelProperty("联系电话")
private String phone;
@ApiModelProperty("状态")
--
Gitblit v1.7.1