解决冲突

Edu.Model/Entity/Course/RB_Order_Guest.cs

@@ -32,11 +32,7 @@ namespace Edu.Model.Entity.Course
         public string GuestName { get; set; }
 
         /// <summary>
-<<<<<<< HEAD
-        /// 状态  1正常  2退学 3-退课申请，4-驳回申请,5-停课，6-停课申请中，7-转班申请中
-=======
         /// 状态  1正常  2退学 3-申请中，4-驳回申请,5-停课，6-停课申请中，7-完结的订单
->>>>>>> ea636e7fac355faaa52e2a0e58c6412c218b20e7
         /// </summary>
         public int GuestState { get; set; }
 

Edu.Module.EduTask/EducationReceiptModule.cs

@@ -81,21 +81,10 @@ namespace Edu.Module.EduTask
         private readonly RB_Order_ChangeRepository order_ChangeRepository = new RB_Order_ChangeRepository();
 
         /// <summary>
-<<<<<<< HEAD
         /// 转班订单
         /// </summary>
         private readonly OrderChangeModule orderChangeModule = new OrderChangeModule();
-=======
-        /// 班级上课计划仓储层对象
-        /// </summary>
-        private readonly RB_Class_PlanRepository class_PlanRepository = new RB_Class_PlanRepository();
-
-        /// <summary>
-        /// 班级上课计划上课时间仓储层对象
-        /// </summary>
-        private readonly RB_Class_TimeRepository class_TimeRepository = new RB_Class_TimeRepository();
 
->>>>>>> ea636e7fac355faaa52e2a0e58c6412c218b20e7
 
         /// <summary>
         /// 获取教务单据分页列表

Edu.Module.EduTask/OrderChangeModule.cs

@@ -343,7 +343,7 @@ namespace Edu.Module.EduTask
                 OrderID = orderId,
                 TCIDList = new List<int>() { classId },
                 OtherType = 0,
-                ReFinanceId = ReFinanceId,
+                ReFinanceId,
                 CallBackReFrId = ReFinanceId,
                 Remark,
                 detailList,

Edu.Repository/Course/RB_Order_GuestRepository.cs

@@ -64,20 +64,13 @@ namespace Edu.Repository.Course
             }
 
             string sql = $@" 
-<<<<<<< HEAD
 SELECT A.*,IFNULL(B.JoinType,0) AS JoinType,IFNULL(B.TargetJoinType,0) AS TargetJoinType,IFNULL(B.StartClassHours,0) AS StartClassHours
        ,IFNULL(C.CourseName,'') AS CourseName,B.EffectStatus,B.EffectTime,B.UpOrderId,B.OrderType,B.CourseId,B.IsRenewOrder,B.RenewOrderId
        ,sc.StopClassEffectTime,B.SourceOrderId,B.TargetOrderId
 FROM RB_Order_Guest AS A LEFT JOIN rb_order AS B ON A.OrderId=B.OrderId
      LEFT JOIN rb_course AS C ON (B.CourseId=C.CourseId AND B.CourseId>0 AND B.OrderType=1)
-    LEFT JOIN (SELECT OrderGuestId,MAX(TakeEffectTime) as StopClassEffectTime from rb_student_stopclass where IsAuditThrough=1 GROUP BY OrderGuestId) as sc on sc.OrderGuestId=a.Id
+     LEFT JOIN (SELECT OrderGuestId,MAX(TakeEffectTime) as StopClassEffectTime from rb_student_stopclass where IsAuditThrough=1 GROUP BY OrderGuestId) as sc on sc.OrderGuestId=a.Id
 WHERE {where}";
-=======
-SELECT A.*,IFNULL(B.IsChaBan,0) AS IsChaBan,IFNULL(B.StartClassHours,0) AS StartClassHours,IFNULL(C.CourseName,'') AS CourseName
-       ,B.EffectStatus,B.EffectTime,B.UpOrderId,B.OrderType,B.CourseId,B.IsRenewOrder,B.RenewOrderId
-FROM RB_Order_Guest AS A LEFT JOIN rb_order AS B ON A.OrderId=B.OrderId
-     LEFT JOIN rb_course AS C ON (B.CourseId=C.CourseId AND B.CourseId>0 AND B.OrderType=1) WHERE {where}";
->>>>>>> ea636e7fac355faaa52e2a0e58c6412c218b20e7
             return Get<RB_Order_Guest_ViewModel>(sql).ToList();
         }
 

Edu.WebApi/appsettings.json

 {
   "ConnectionStrings": {
-    "DefaultConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=test_edu;CharSet=utf8mb4; Convert Zero Datetime=true; ",
+    "DefaultConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_edu;CharSet=utf8mb4; Convert Zero Datetime=true; ",
     "DefaultConnectionPName": "MySql.Data.MySqlClient",
     "FinanceConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ",
     "FinanceConnectionPName": "MySql.Data.MySqlClient",