Merge remote-tracking branch 'origin/dev_New' into dev_新疆_大罗素马铃薯

云

9 天以前 e4c10a806ff29d18cdbdd182a5930316eae3fd83

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