Merge branch 'jtwy' into dev_New

zss

3 天以前 e435c834aac75f49cf2d1945bd4f849524e8b59c

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