Merge remote-tracking branch 'origin/master'

guyue

3 天以前 b7ff8446a58d59e7df8a588104c231c7af7d8573

 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;