Merge remote-tracking branch 'origin/master'

fuliqi

2024-10-29 8883d90ba7d60a61590b715d1a3be9e3ae2adb2d

 src/main/java/com/ycl/jxkg/domain/vo/admin/user/UserPageRequestVO.java

@@ -6,7 +6,7 @@
@Data
public class UserPageRequestVO extends BasePage {

    private String userName;
    private String realName;

    private Integer role;