解决冲突文件

TEAMModelOS.SDK/Models/Service/ActivityService.cs

@@ -180,7 +180,7 @@ namespace TEAMModelOS.SDK
                     {
                         try
                         {
-                            await updateClassResulte(client, classResults, standerAnswers, member.id, groupChange.listid);
+                            await updateClassResulte(client, classResults, standerAnswers, member.id, groupChange, activity.id);
                             StuActivity stuActivity= await client.GetContainer(Constant.TEAMModelOS, "Student").ReadItemAsync<StuActivity>(activity.id, new PartitionKey($"Activity-{member.code.Replace("Base-", "")}-{member.id}"));
                             stuActivity.classIds.Remove(groupChange.listid);
                             if (stuActivity.classIds.IsNotEmpty())
@@ -202,7 +202,7 @@ namespace TEAMModelOS.SDK
                     {
                         try
                         {
-                            await updateClassResulte(client, classResults, standerAnswers, member.id, groupChange.listid);
+                            await updateClassResulte(client, classResults, standerAnswers, member.id, groupChange,activity.id);
                             StuActivity stuActivity= await client.GetContainer(Constant.TEAMModelOS, "Student").ReadItemAsync<StuActivity>(activity.id, new PartitionKey($"Activity-{member.id}"));
                             stuActivity.classIds.Remove(groupChange.listid);
                             if (stuActivity.classIds.IsNotEmpty())