Merge remote-tracking branch 'origin/2.0' into 2.0

无关风月

3 天以前 e8f01399a49bb718f184e31d0f6de27c3dc64cef

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/UserListVO.java

@@ -29,4 +29,6 @@
    private String deptName;
    // 状态 1=正常 2=冻结
    private Integer status;

    private Integer version;
}