页面修改

Edu.Module.Course/ClassModule.cs

@@ -558,16 +558,9 @@ namespace Edu.Module.Course
                 {
                     extModel.DefaultTimeList = Common.Plugin.JsonHelper.DeserializeObject<List<RB_Class_Time_ViewModel>>(extModel.DefaultTimeJson);
                 }
-<<<<<<< HEAD
                 if (!string.IsNullOrEmpty(extModel.DateJson) && extModel.ClassStyle!= Common.Enum.Course.ClassStyleEnum.OnLine)
                 { 
                   extModel.WeekDayList= Common.Plugin.JsonHelper.DeserializeObject<List<string>>(extModel.DateJson);
-=======
-
-                if (!string.IsNullOrEmpty(extModel.DateJson) && extModel.ClassStyle != Common.Enum.Course.ClassStyleEnum.OnLine)
-                {
-                    extModel.WeekDayList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(extModel.DateJson);
->>>>>>> 492c78a88ff90bf7554f40fab00e295fd4abd531
                 }
             }
             return extModel;

Edu.Repository/Log/RB_Class_LogRepository.cs

@@ -57,22 +57,18 @@ WHERE 1=1
         /// <param name="School_Id">校区编号</param>
         /// <param name="CreateBy">创建人</param>
         /// <returns></returns>
-        public bool AddClassLogRepository(RB_Class_Log model )
+        public bool AddClassLogRepository(RB_Class_Log model)
         {
-<<<<<<< .merge_file_a16616
-            var model = new RB_Class_Log()
+            var newmodel = new RB_Class_Log()
             {
-                LogType = logType,
-                LogContent = LogContent.TrimStart(',').TrimEnd(',').TrimStart('、').TrimEnd('、'),
-                ClassId = ClassId,
-                Group_Id = Group_Id,
-                School_Id = School_Id,
-                CreateBy = CreateBy,
+                LogType = model.LogType,
+                LogContent = model.LogContent.TrimStart(',').TrimEnd(',').TrimStart('、').TrimEnd('、'),
+                ClassId = model.ClassId,
+                Group_Id = model.Group_Id,
+                School_Id = model.School_Id,
+                CreateBy = model.CreateBy,
                 CreateTime=DateTime.Now,
             };
-=======
-           
->>>>>>> .merge_file_a01344
             return base.Insert(model) > 0;
         }
     }