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

zss

10 天以前 0629abbc318d5f78d2e91b45e4526d35a4ed8115

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