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

rk

8 天以前 9cfcd4c424c99f1f9dede58c3bf5aa0166c95381

 server/meeting/meeting_admin/src/main/java/com/doumee/config/shiro/ShiroRealm.java

@@ -1,6 +1,6 @@
package com.doumee.config.shiro;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.dao.system.model.SystemPermission;
import com.doumee.dao.system.model.SystemRole;
import com.doumee.dao.system.model.SystemUser;