页面修改

Edu.Module.Public/PublicModule.cs

@@ -70,19 +70,21 @@ namespace Edu.Module.Public
         /// <returns></returns>
         public List<object> GetStudyAbroadListModule()
         {
-            List<object> list = new List<object>();
-            list.Add(new
+            List<object> list = new List<object>
             {
-                Id = Common.Config.StudyAbroadDirectorId,
-                AuditType=1,
-                Name = "部门主管审核"
-            });
-            list.Add(new
-            {
-                Id = Common.Config.StudyAbroadManagerId,
-                AuditType = 2,
-                Name = "部门负责人审核"
-            });
+                new
+                {
+                    Id = Common.Config.StudyAbroadDirectorId,
+                    AuditType = 1,
+                    Name = "部门主管审核"
+                },
+                new
+                {
+                    Id = Common.Config.StudyAbroadManagerId,
+                    AuditType = 2,
+                    Name = "部门负责人审核"
+                }
+            };
             return list;
         }
         #endregion

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -704,10 +704,6 @@ namespace Edu.WebApi.Controllers.Course
                 if (signModel != null && signModel.ClassCheckId > 0)
                 {
                     item.ClassCheckId = signModel.ClassCheckId;
-<<<<<<< HEAD
-=======
-                    //item.StudyNum = signModel.StudyNum;
->>>>>>> 0d337e2c30a339e5ce3b2c8c34b28c7a32a2bdee
                     item.Group_Id = signModel.Group_Id;
                     item.CreateTime = signModel.CreateTime;
                     item.CreateBy = base.UserInfo.Id;