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

yaowanxin

9 天以前 df35c666ff8342343c82735ee25c5f04ae0d054c

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