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

zss

4 天以前 17d65c77c6fedf1b51afec166c5a9735c6e4d38e

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