冲突修改

OpenAuth.App/ServiceApp/ManageApp.cs

@@ -191,7 +191,7 @@ namespace OpenAuth.App.ServiceApp
         /// </summary>
         /// <param name="key"></param>
         /// <returns></returns>
-        public async Task<Response<List<LasaWorkspace>>> GetWorkspaceList(string key)
+        public async Task<Response<List<dynamic>>> GetWorkspaceList(string key)
         {
             RefAsync<int> totalCount = 0;
             using (var db = UnitWork.CreateContext())
@@ -211,7 +211,7 @@ namespace OpenAuth.App.ServiceApp
                         u.Name
                     })
                     .ToListAsync();
-                return new Response<List<LasaWorkspace>>
+                return new Response<List<dynamic>>
                 {
                     Result =  list
                 };