Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -607,6 +607,10 @@ namespace Edu.WebApi.Controllers.Course
                     EffectTime = Common.ConvertHelper.FormatDate(model.EffectTime),
                     model.UpOrderId,
                     model.VisitorReserveId,
+                    model.JoinType,
+                    model.TargetJoinType,
+                    model.SourceOrderId,
+                    model.TargetOrderId,
                 },
                 StepPriceList = list.Select(x => new
                 {

Edu.WebApi/Controllers/User/UserController.cs

@@ -1560,7 +1560,7 @@ namespace Edu.WebApi.Controllers.User
  
             var Remark = base.ParmJObj.GetStringValue("Remark");
             var targetAccountType = (AccountTypeEnum)base.ParmJObj.GetInt("TargetAccountType");
-            var flag = managerModule.SetEmployeeTypeModule(targetAccountType, AccountId, AccountType,Remark);
+            var flag = managerModule.SetEmployeeTypeModule(targetAccountType, AccountId, AccountType,Remark,base.UserInfo);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
         #endregion