Merge remote-tracking branch 'origin/master'

zss

2 天以前 118afd697fe3197236dcf0ffd6cfd39bcec2d85f

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