代码修复

2022-07-14 09:45:13 +08:00 · 2022-07-14 09:45:13 +08:00 · 495e367c4d
commit 495e367c4d
parent fd23a9a5d0
1 changed files with 0 additions and 4 deletions
--- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/cooperation/CoeCooperationAPIManager.java
+++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/cooperation/CoeCooperationAPIManager.java
@ -148,11 +148,7 @@ public class CoeCooperationAPIManager {
        CoeCooperationRoleDao roleDao = new CoeCooperationRoleDao();
        return roleDao.getCooperationHideRoleByRoleName(teamId,userid);
    }
-<<<<<<< HEAD

-
-=======
->>>>>>> 960a62dd8cc08f186bdb5ce778b156f0fbdf89fd
    /**
     * 获取小组的管理员用户
     * @param teamId