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

liyong

6 天以前 f5624a59380db70633eebe3612e2d3c703012b41

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