Merge branch 'dev_tide' into dev_tide_zlglxt_xinlan

zouyu

10 天以前 09394848ce262aff81897503d32ec334fd3f2b6f

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