Merge branch 'dev_New' into dev_宁夏_中盛建材

zss

7 天以前 43113d6b1670530dfb4348836fd491c79f36af0a

 src/main/java/com/ruoyi/project/system/domain/vo/SysUserDeptVo.java

@@ -12,4 +12,6 @@
public class SysUserDeptVo extends SysUserDept {

    private String deptName;

    private String userName;
}