Merge remote-tracking branch 'origin/pim_yys'

maven

3 天以前 5da5bf5cb70a889645e156eff869ff276c5a573b

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