Merge remote-tracking branch 'origin/master'

fuliqi

2024-10-29 c70945a73ffa521339a4fe4f43e308cae2fb63b8

 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;