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

buhuazhen

9 天以前 2df3f64bbacbf960e1d6b9b73893aeb0c01b7d1d

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