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

yaowanxin

6 天以前 ac135b66a5ab9f2f74c55961066974e815b88e9a

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