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

gongchunyi

5 天以前 70538f5464af062cd52628d468a17a8bb885e88f

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