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

yaowanxin

3 天以前 a0fa5fa2d82f659a4b3e4a285a1f8603cc93ba86

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