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

yaowanxin

2 天以前 4b189df3b30fa59dca58c5c7e7b5599a692a807a

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