Merge remote-tracking branch 'origin/master'

huliguo

1 天以前 23ac3e4f8fb16db0759ba5c91c4d06d622c67009

 src/main/java/com/linghu/model/vo/UserPageVO.java

@@ -10,10 +10,10 @@
    private Integer user_id;

    @ApiModelProperty("用户名")
    private Integer user_name;
    private String user_name;

    @ApiModelProperty("用户邮箱")
    private Integer user_email;
    private String user_email;

    @ApiModelProperty("密码")
    private String password;
@@ -21,6 +21,8 @@
    @ApiModelProperty("分组名称")
    private String sectionalization_name;

    @ApiModelProperty("分组名称")
    private Integer sectionalization_id;
    @ApiModelProperty("状态")
    private String status;