++

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -4419,7 +4419,6 @@ FROM
 
                         //公司信息书签
                         if (currCompanyInfos.Count > 0)
->>>>>>> e439a91d94e7a4a4a94def528c4af85f42e3d5af
                         {
                             for (int i = 0; i < currCompanyInfos.Count; i++)
                             {