Merge branch 'master' of https://gitee.com/frane-yang/SGGL_CWCEC

SGGL/BLL/BaseInfo/TrainTypeService.cs

@@ -21,7 +21,7 @@ namespace BLL
         {
             return Funs.DB.Base_TrainType.FirstOrDefault(e => e.TrainTypeId == trainTypeId);
         }
-        
+
         /// <summary>
         /// 添加培训类型
         /// </summary>
@@ -34,6 +34,7 @@ namespace BLL
                 TrainTypeId = trainType.TrainTypeId,
                 TrainTypeCode = trainType.TrainTypeCode,
                 TrainTypeName = trainType.TrainTypeName,
+                TrainType = trainType.TrainType,
                 Remark = trainType.Remark,
                 IsAboutSendCard = trainType.IsAboutSendCard,
                 IsRepeat = trainType.IsRepeat
@@ -54,6 +55,7 @@ namespace BLL
             {
                 newTrainType.TrainTypeCode = trainType.TrainTypeCode;
                 newTrainType.TrainTypeName = trainType.TrainTypeName;
+                newTrainType.TrainType = trainType.TrainType;
                 newTrainType.Remark = trainType.Remark;
                 newTrainType.IsAboutSendCard = trainType.IsAboutSendCard;
                 newTrainType.IsRepeat = trainType.IsRepeat;
@@ -92,7 +94,7 @@ namespace BLL
         {
             return (from x in Funs.DB.Base_TrainType orderby x.TrainTypeCode select x).ToList();
         }
-        
+
         /// <summary>
         /// 获取关联人员发卡的培训类型列表
         /// </summary>