Merge remote-tracking branch 'origin/master'

nickchange

2023-12-08 1b9a01bf5000714b08a75a50dd1f5f3eab65d888

 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;
}