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

云

3 天以前 6b362aaa220baaa6be5e957a89ace79eefde9f93

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