Merge branch 'refs/heads/pim_ly'

liyong

5 天以前 446e67cdd45c628da108f1b10779b5c5ffbd00cb

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