Merge remote-tracking branch 'origin/dev_长治_祥雨远见' into dev_长治_祥雨远见

yuan

6 天以前 84b131de4a1deb526066fc0f7e7514ac43838bf8

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