EF实体更新 ， 添加餐食行程

travelExport/Crm_CustomerCert_Data.cs

@@ -0,0 +1,35 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Crm_CustomerCert_Data
+    {
+        public int Id { get; set; }
+        public Nullable<int> DcId { get; set; }
+        public Nullable<int> SdId { get; set; }
+        public Nullable<int> PassportType { get; set; }
+        public string CertNo { get; set; }
+        public string Country { get; set; }
+        public string Area { get; set; }
+        public string TargetCountry { get; set; }
+        public Nullable<System.DateTime> IssueDt { get; set; }
+        public Nullable<System.DateTime> ExpiryDt { get; set; }
+        public string IDCardAddress { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/Crm_CustomerCompany_Data.cs

@@ -0,0 +1,31 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Crm_CustomerCompany_Data
+    {
+        public int Id { get; set; }
+        public string CompanyAbbreviation { get; set; }
+        public string CompanyFullName { get; set; }
+        public string Address { get; set; }
+        public string PostCodes { get; set; }
+        public Nullable<int> LastedOpUserId { get; set; }
+        public Nullable<System.DateTime> LastedOpDt { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/Crm_DeleClient_Data.cs

@@ -0,0 +1,114 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Crm_DeleClient_Data
+    {
+        public int Id { get; set; }
+        public Nullable<int> DiId { get; set; }
+        public string LastName { get; set; }
+        public string FirstName { get; set; }
+        public string OldName { get; set; }
+        public string Pinyin { get; set; }
+        public Nullable<int> Sex { get; set; }
+        public Nullable<int> Marriage { get; set; }
+        public string Tel { get; set; }
+        public string BirthProvince { get; set; }
+        public string BirthCity { get; set; }
+        public Nullable<System.DateTime> BirthDay { get; set; }
+        public string AirType { get; set; }
+        public Nullable<int> SeatPref { get; set; }
+        public string AirRemark { get; set; }
+        public string RoomType { get; set; }
+        public string RoomPref { get; set; }
+        public string Phone { get; set; }
+        public string Email { get; set; }
+        public string Address { get; set; }
+        public string HighestEducation { get; set; }
+        public string PostCodes { get; set; }
+        public Nullable<int> CrmCompanyId { get; set; }
+        public string Job { get; set; }
+        public string WorkState { get; set; }
+        public Nullable<System.DateTime> WorkDate { get; set; }
+        public string Wage { get; set; }
+        public string ClientPhone { get; set; }
+        public string ClientFax { get; set; }
+        public string ClientEmail { get; set; }
+        public string ClientLeader { get; set; }
+        public string ClientLeaderJob { get; set; }
+        public Nullable<int> IsGetSchengen { get; set; }
+        public Nullable<System.DateTime> StartTime { get; set; }
+        public Nullable<System.DateTime> EndTime { get; set; }
+        public Nullable<int> IsFinger { get; set; }
+        public Nullable<System.DateTime> FingerDate { get; set; }
+        public Nullable<int> IsVisitUC { get; set; }
+        public Nullable<System.DateTime> USADate { get; set; }
+        public Nullable<int> USADays { get; set; }
+        public Nullable<System.DateTime> CanDate { get; set; }
+        public Nullable<int> CanDays { get; set; }
+        public Nullable<int> IsUSAVia { get; set; }
+        public Nullable<System.DateTime> GetUSAVisaDate { get; set; }
+        public string GetUPPlace { get; set; }
+        public string USAVisaCate { get; set; }
+        public string USAVisaCode { get; set; }
+        public Nullable<int> USAFinger { get; set; }
+        public Nullable<int> IsRejected { get; set; }
+        public Nullable<System.DateTime> RejectedDate { get; set; }
+        public string RejectedPlace { get; set; }
+        public string RejectedVisa { get; set; }
+        public Nullable<int> IsRevoke { get; set; }
+        public Nullable<int> IsLose { get; set; }
+        public Nullable<System.DateTime> LoseDate { get; set; }
+        public string LoseCode { get; set; }
+        public Nullable<int> IsUSAVisa { get; set; }
+        public Nullable<int> MateUSA { get; set; }
+        public string MateIden { get; set; }
+        public Nullable<int> WHUSA { get; set; }
+        public string WHIden { get; set; }
+        public Nullable<int> ParentUSA { get; set; }
+        public string ParentIden { get; set; }
+        public Nullable<int> ChildUSA { get; set; }
+        public string ChildIden { get; set; }
+        public Nullable<int> BroUSA { get; set; }
+        public string BroIden { get; set; }
+        public string Social { get; set; }
+        public Nullable<int> IsArmy { get; set; }
+        public string ArmyState { get; set; }
+        public string CostBearers { get; set; }
+        public string TableOpName { get; set; }
+        public string TableOpTel { get; set; }
+        public Nullable<System.DateTime> TableDate { get; set; }
+        public string Party { get; set; }
+        public string Nationality { get; set; }
+        public Nullable<System.DateTime> WeddingDate { get; set; }
+        public Nullable<System.DateTime> DivorceDate { get; set; }
+        public string MateName { get; set; }
+        public Nullable<System.DateTime> MateBirthDay { get; set; }
+        public string MateBirthCity { get; set; }
+        public string MateBirthCountry { get; set; }
+        public string MateAddress { get; set; }
+        public string MateClient { get; set; }
+        public string MateClientAddress { get; set; }
+        public string MateJob { get; set; }
+        public string VisitCountry { get; set; }
+        public string Paper { get; set; }
+        public string Papent { get; set; }
+        public string PhD { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/Crm_NewClientData_Encryption.cs

@@ -0,0 +1,46 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Crm_NewClientData_Encryption
+    {
+        public int Id { get; set; }
+        public Nullable<int> Number { get; set; }
+        public Nullable<int> Lvlid { get; set; }
+        public string Client { get; set; }
+        public string Weight { get; set; }
+        public string ClientShort { get; set; }
+        public string Contact { get; set; }
+        public Nullable<int> Gender { get; set; }
+        public string Passport { get; set; }
+        public Nullable<System.DateTime> PassportDate { get; set; }
+        public string Job { get; set; }
+        public string TelePhone { get; set; }
+        public string Phone { get; set; }
+        public string Email { get; set; }
+        public string Location { get; set; }
+        public string Address { get; set; }
+        public string Birthday { get; set; }
+        public string OtherInfo { get; set; }
+        public string WeChat { get; set; }
+        public Nullable<int> Category { get; set; }
+        public Nullable<int> PreDele { get; set; }
+        public Nullable<int> FinlishedDele { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/DB.Context.cs

@@ -138,5 +138,45 @@ namespace travelExport
         public virtual DbSet<Res_OfficialActivities0426> Res_OfficialActivities0426 { get; set; }
         public virtual DbSet<Grp_HotelInquiry> Grp_HotelInquiry { get; set; }
         public virtual DbSet<Grp_VisaInfo> Grp_VisaInfo { get; set; }
+        public virtual DbSet<Fin_LocalGuideRelevancyOverspend> Fin_LocalGuideRelevancyOverspend { get; set; }
+        public virtual DbSet<Fin_OverSpendRelevancyCollectionStatement> Fin_OverSpendRelevancyCollectionStatement { get; set; }
+        public virtual DbSet<Fin_RoyaltyConfirm> Fin_RoyaltyConfirm { get; set; }
+        public virtual DbSet<Fin_RoyaltyForm> Fin_RoyaltyForm { get; set; }
+        public virtual DbSet<Grp_ApprovalTravel> Grp_ApprovalTravel { get; set; }
+        public virtual DbSet<Grp_ApprovalTravelDetails> Grp_ApprovalTravelDetails { get; set; }
+        public virtual DbSet<Grp_DayAndCostDraft> Grp_DayAndCostDraft { get; set; }
+        public virtual DbSet<Grp_DayOtherPrice> Grp_DayOtherPrice { get; set; }
+        public virtual DbSet<Grp_DayOtherPriceDraft> Grp_DayOtherPriceDraft { get; set; }
+        public virtual DbSet<Grp_EnterExitCostDraft> Grp_EnterExitCostDraft { get; set; }
+        public virtual DbSet<Grp_EnterExitCostDraftPermission> Grp_EnterExitCostDraftPermission { get; set; }
+        public virtual DbSet<Grp_EnterExitCostPermission> Grp_EnterExitCostPermission { get; set; }
+        public virtual DbSet<Grp_GroupModelFile> Grp_GroupModelFile { get; set; }
+        public virtual DbSet<Grp_HotelReservationsContent> Grp_HotelReservationsContent { get; set; }
+        public virtual DbSet<Grp_OfficialDutyLinkTranslator> Grp_OfficialDutyLinkTranslator { get; set; }
+        public virtual DbSet<Grp_Opinionaire> Grp_Opinionaire { get; set; }
+        public virtual DbSet<Grp_RestaurantInfo> Grp_RestaurantInfo { get; set; }
+        public virtual DbSet<Grp_VisaCommission> Grp_VisaCommission { get; set; }
+        public virtual DbSet<Grp_VisitingClients> Grp_VisitingClients { get; set; }
+        public virtual DbSet<Per_AssessmentContentSetting> Per_AssessmentContentSetting { get; set; }
+        public virtual DbSet<Per_AssessmentScore> Per_AssessmentScore { get; set; }
+        public virtual DbSet<Per_AssessmentSetting> Per_AssessmentSetting { get; set; }
+        public virtual DbSet<Pm_GoodsInfo> Pm_GoodsInfo { get; set; }
+        public virtual DbSet<Pm_GoodsReceive> Pm_GoodsReceive { get; set; }
+        public virtual DbSet<Pm_GoodsStorage> Pm_GoodsStorage { get; set; }
+        public virtual DbSet<Res_BasicInsuranceCost> Res_BasicInsuranceCost { get; set; }
+        public virtual DbSet<Res_MediaSuppliers> Res_MediaSuppliers { get; set; }
+        public virtual DbSet<Res_TranslatorLibrary> Res_TranslatorLibrary { get; set; }
+        public virtual DbSet<Sys_Cities> Sys_Cities { get; set; }
+        public virtual DbSet<Sys_Continent> Sys_Continent { get; set; }
+        public virtual DbSet<Sys_Countries> Sys_Countries { get; set; }
+        public virtual DbSet<Sys_DeviceToken> Sys_DeviceToken { get; set; }
+        public virtual DbSet<Sys_ExchangeRateRecord> Sys_ExchangeRateRecord { get; set; }
+        public virtual DbSet<Crm_CustomerCert_Data> Crm_CustomerCert_Data { get; set; }
+        public virtual DbSet<Crm_CustomerCompany_Data> Crm_CustomerCompany_Data { get; set; }
+        public virtual DbSet<Crm_DeleClient_Data> Crm_DeleClient_Data { get; set; }
+        public virtual DbSet<Crm_NewClientData_Encryption> Crm_NewClientData_Encryption { get; set; }
+        public virtual DbSet<Res_InvitationOfficialActivityData_Data> Res_InvitationOfficialActivityData_Data { get; set; }
+        public virtual DbSet<Res_TranslatorLibrary_Encryption> Res_TranslatorLibrary_Encryption { get; set; }
+        public virtual DbSet<Sys_Users_Encryption> Sys_Users_Encryption { get; set; }
     }
 }

travelExport/DB.edmx.diagram

@@ -118,6 +118,46 @@
         <EntityTypeShape EntityType="oa2023DBModel.Res_OfficialActivities0426" Width="1.5" PointX="4.75" PointY="38.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Grp_HotelInquiry" Width="1.5" PointX="29.375" PointY="38.75" />
         <EntityTypeShape EntityType="oa2023DBModel.Grp_VisaInfo" Width="1.5" PointX="39.375" PointY="7.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Fin_LocalGuideRelevancyOverspend" Width="1.5" PointX="5.75" PointY="16.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Fin_OverSpendRelevancyCollectionStatement" Width="1.5" PointX="0.75" PointY="27.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Fin_RoyaltyConfirm" Width="1.5" PointX="2.75" PointY="27.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Fin_RoyaltyForm" Width="1.5" PointX="39.75" PointY="3.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Grp_ApprovalTravel" Width="1.5" PointX="39.75" PointY="13.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Grp_ApprovalTravelDetails" Width="1.5" PointX="39.75" PointY="17.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Grp_DayAndCostDraft" Width="1.5" PointX="19.75" PointY="39.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Grp_DayOtherPrice" Width="1.5" PointX="39.75" PointY="21.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Grp_DayOtherPriceDraft" Width="1.5" PointX="21.75" PointY="39.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Grp_EnterExitCostDraft" Width="1.5" PointX="23.75" PointY="39.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Grp_EnterExitCostDraftPermission" Width="1.5" PointX="39.75" PointY="26.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Grp_EnterExitCostPermission" Width="1.5" PointX="39.75" PointY="30.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Grp_GroupModelFile" Width="1.5" PointX="39.75" PointY="34.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Grp_HotelReservationsContent" Width="1.5" PointX="35.75" PointY="39.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Grp_OfficialDutyLinkTranslator" Width="1.5" PointX="37.75" PointY="39.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Grp_Opinionaire" Width="1.5" PointX="39.75" PointY="38.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Grp_RestaurantInfo" Width="1.5" PointX="0.75" PointY="40.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Grp_VisaCommission" Width="1.5" PointX="7.75" PointY="40.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Grp_VisitingClients" Width="1.5" PointX="9.75" PointY="40.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Per_AssessmentContentSetting" Width="1.5" PointX="11.75" PointY="40.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Per_AssessmentScore" Width="1.5" PointX="13.75" PointY="40.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Per_AssessmentSetting" Width="1.5" PointX="15.75" PointY="40.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Pm_GoodsInfo" Width="1.5" PointX="41.75" PointY="0.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Pm_GoodsReceive" Width="1.5" PointX="41.75" PointY="5.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Pm_GoodsStorage" Width="1.5" PointX="41.75" PointY="10.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Res_BasicInsuranceCost" Width="1.5" PointX="41.75" PointY="16.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Res_MediaSuppliers" Width="1.5" PointX="41.75" PointY="20.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Res_TranslatorLibrary" Width="1.5" PointX="41.75" PointY="26.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Sys_Cities" Width="1.5" PointX="31.75" PointY="41.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Sys_Continent" Width="1.5" PointX="41.75" PointY="32.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Sys_Countries" Width="1.5" PointX="41.75" PointY="36.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Sys_DeviceToken" Width="1.5" PointX="41.75" PointY="41.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Sys_ExchangeRateRecord" Width="1.5" PointX="43.75" PointY="0.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Crm_CustomerCert_Data" Width="1.5" PointX="43.75" PointY="4.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Crm_CustomerCompany_Data" Width="1.5" PointX="43.75" PointY="9.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Crm_DeleClient_Data" Width="1.5" PointX="43.75" PointY="14.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Crm_NewClientData_Encryption" Width="1.5" PointX="43.75" PointY="34.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Res_InvitationOfficialActivityData_Data" Width="1.5" PointX="43.75" PointY="41.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Res_TranslatorLibrary_Encryption" Width="1.5" PointX="15.75" PointY="44.75" />
+        <EntityTypeShape EntityType="oa2023DBModel.Sys_Users_Encryption" Width="1.5" PointX="17.75" PointY="44.75" />
       </Diagram>
     </edmx:Diagrams>
   </edmx:Designer>

travelExport/Fin_LocalGuideRelevancyOverspend.cs

@@ -0,0 +1,27 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Fin_LocalGuideRelevancyOverspend
+    {
+        public int Id { get; set; }
+        public int LocalGuideId { get; set; }
+        public int OverspendId { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/Fin_OverSpendRelevancyCollectionStatement.cs

@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Fin_OverSpendRelevancyCollectionStatement
+    {
+        public int Id { get; set; }
+        public int OverSpendId { get; set; }
+        public int CollectionStatementId { get; set; }
+        public int Diid { get; set; }
+        public int LocalGuideId { get; set; }
+        public decimal savePrice { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/Fin_RoyaltyConfirm.cs

@@ -0,0 +1,35 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Fin_RoyaltyConfirm
+    {
+        public int Id { get; set; }
+        public decimal Price { get; set; }
+        public string TeamName { get; set; }
+        public int TeamId { get; set; }
+        public string ChiArr { get; set; }
+        public string TeamLvStr { get; set; }
+        public System.DateTime VisitDate { get; set; }
+        public string Temp { get; set; }
+        public int IsConfirm { get; set; }
+        public int UserId { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+        public Nullable<int> IsSeed { get; set; }
+    }
+}

travelExport/Fin_RoyaltyForm.cs

@@ -0,0 +1,28 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Fin_RoyaltyForm
+    {
+        public int Id { get; set; }
+        public int UserId { get; set; }
+        public int DayOverhead { get; set; }
+        public string ConfirmIdArr { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/Grp_ApprovalTravel.cs

@@ -0,0 +1,27 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Grp_ApprovalTravel
+    {
+        public int Id { get; set; }
+        public Nullable<int> Diid { get; set; }
+        public string Date { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/Grp_ApprovalTravelDetails.cs

@@ -0,0 +1,28 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Grp_ApprovalTravelDetails
+    {
+        public int Id { get; set; }
+        public string Time { get; set; }
+        public int ParentId { get; set; }
+        public string Details { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/Grp_DayAndCostDraft.cs

@@ -0,0 +1,33 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Grp_DayAndCostDraft
+    {
+        public int Id { get; set; }
+        public Nullable<int> ParentId { get; set; }
+        public Nullable<int> Type { get; set; }
+        public Nullable<int> Days { get; set; }
+        public Nullable<int> NationalTravelFeeId { get; set; }
+        public string Place { get; set; }
+        public Nullable<decimal> Cost { get; set; }
+        public Nullable<int> Currency { get; set; }
+        public Nullable<decimal> SubTotal { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/Grp_DayOtherPrice.cs

@@ -0,0 +1,31 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Grp_DayOtherPrice
+    {
+        public int Id { get; set; }
+        public int Diid { get; set; }
+        public int SetDataId { get; set; }
+        public int Index { get; set; }
+        public decimal Cost { get; set; }
+        public int Currency { get; set; }
+        public decimal SubTotal { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/Grp_DayOtherPriceDraft.cs

@@ -0,0 +1,31 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Grp_DayOtherPriceDraft
+    {
+        public int Id { get; set; }
+        public int ParentId { get; set; }
+        public int SetDataId { get; set; }
+        public int Index { get; set; }
+        public decimal Cost { get; set; }
+        public int Currency { get; set; }
+        public decimal SubTotal { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/Grp_EnterExitCostDraft.cs

@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Grp_EnterExitCostDraft
+    {
+        public int Id { get; set; }
+        public string DraftName { get; set; }
+        public Nullable<decimal> InsidePay { get; set; }
+        public Nullable<decimal> Visa { get; set; }
+        public string VisaRemark { get; set; }
+        public Nullable<decimal> YiMiao { get; set; }
+        public Nullable<decimal> HeSuan { get; set; }
+        public Nullable<decimal> Service { get; set; }
+        public Nullable<decimal> Ticket { get; set; }
+        public Nullable<decimal> Safe { get; set; }
+        public string FirstItemRemark { get; set; }
+        public Nullable<decimal> OutsideJJPay { get; set; }
+        public Nullable<decimal> OutsideGWPay { get; set; }
+        public Nullable<decimal> OutsideTDPay { get; set; }
+        public Nullable<decimal> AirJJ { get; set; }
+        public Nullable<decimal> AirGW { get; set; }
+        public Nullable<decimal> AirTD { get; set; }
+        public Nullable<decimal> CityTranffic { get; set; }
+        public Nullable<decimal> RateUSD { get; set; }
+        public Nullable<decimal> RateJPY { get; set; }
+        public Nullable<decimal> RateEUR { get; set; }
+        public Nullable<decimal> RateGBP { get; set; }
+        public Nullable<decimal> RateHKD { get; set; }
+        public string CurrencyRemark { get; set; }
+        public Nullable<int> ChoiceOne { get; set; }
+        public Nullable<int> ChoiceTwo { get; set; }
+        public Nullable<int> ChoiceThree { get; set; }
+        public Nullable<int> ChoiceFour { get; set; }
+        public Nullable<int> ChoiceFive { get; set; }
+        public Nullable<int> SumJJC { get; set; }
+        public Nullable<int> SumGWC { get; set; }
+        public Nullable<int> SumTDC { get; set; }
+        public Nullable<int> AirJJC_Checked { get; set; }
+        public Nullable<int> AirGWC_Checked { get; set; }
+        public Nullable<int> AirTDC_Checked { get; set; }
+        public Nullable<int> OtherExpenses_Checked { get; set; }
+        public Nullable<int> ChoiceSix { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+        public Nullable<int> IsConfirm { get; set; }
+        public string TwoItemRemark { get; set; }
+    }
+}

travelExport/Grp_EnterExitCostDraftPermission.cs

@@ -0,0 +1,28 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Grp_EnterExitCostDraftPermission
+    {
+        public int Id { get; set; }
+        public Nullable<int> DraftId { get; set; }
+        public Nullable<int> UserId { get; set; }
+        public Nullable<int> Permission { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/Grp_EnterExitCostPermission.cs

@@ -0,0 +1,28 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Grp_EnterExitCostPermission
+    {
+        public int Id { get; set; }
+        public Nullable<int> GroupId { get; set; }
+        public Nullable<int> UserId { get; set; }
+        public Nullable<int> Permission { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/Grp_GroupModelFile.cs

@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Grp_GroupModelFile
+    {
+        public int Id { get; set; }
+        public int Diid { get; set; }
+        public string FilePath { get; set; }
+        public int Ctable { get; set; }
+        public int Cid { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+        public string FileName { get; set; }
+    }
+}

travelExport/Grp_HotelReservationsContent.cs

@@ -0,0 +1,45 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Grp_HotelReservationsContent
+    {
+        public int Id { get; set; }
+        public Nullable<int> DiId { get; set; }
+        public Nullable<int> HrId { get; set; }
+        public Nullable<int> PriceType { get; set; }
+        public Nullable<decimal> Price { get; set; }
+        public Nullable<int> Currency { get; set; }
+        public Nullable<decimal> Rate { get; set; }
+        public Nullable<int> IsOppay { get; set; }
+        public Nullable<int> PayDId { get; set; }
+        public string ConsumptionPatterns { get; set; }
+        public string ConsumptionDate { get; set; }
+        public Nullable<int> CTDId { get; set; }
+        public string BankNo { get; set; }
+        public string CardholderName { get; set; }
+        public string CompanyBankNo { get; set; }
+        public string OtherBankName { get; set; }
+        public string OtherSideNo { get; set; }
+        public string OtherSideName { get; set; }
+        public Nullable<int> IsPay { get; set; }
+        public string Payee { get; set; }
+        public Nullable<int> OrbitalPrivateTransfer { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/Grp_OfficialDutyLinkTranslator.cs

@@ -0,0 +1,27 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Grp_OfficialDutyLinkTranslator
+    {
+        public int Id { get; set; }
+        public Nullable<int> OfficialDutyId { get; set; }
+        public Nullable<int> TranslatorId { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/Grp_Opinionaire.cs

@@ -0,0 +1,44 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Grp_Opinionaire
+    {
+        public int Id { get; set; }
+        public Nullable<int> DiId { get; set; }
+        public string CityName { get; set; }
+        public string TourGuideName { get; set; }
+        public string Catering { get; set; }
+        public string CateringReason { get; set; }
+        public string Stay { get; set; }
+        public string StayReason { get; set; }
+        public string Route { get; set; }
+        public string RouteReason { get; set; }
+        public string OfficialActivity { get; set; }
+        public string OfficialActivityReason { get; set; }
+        public string TourGuide { get; set; }
+        public string TourGuideReason { get; set; }
+        public string Translate { get; set; }
+        public string TranslateReason { get; set; }
+        public string Trip { get; set; }
+        public string TripReason { get; set; }
+        public string ESFileName { get; set; }
+        public string SignatureDate { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/Grp_RestaurantInfo.cs

@@ -0,0 +1,33 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Grp_RestaurantInfo
+    {
+        public int Id { get; set; }
+        public Nullable<int> GroupId { get; set; }
+        public string Date { get; set; }
+        public string StartTime { get; set; }
+        public string EndTime { get; set; }
+        public Nullable<int> Type { get; set; }
+        public string Name { get; set; }
+        public string Tel { get; set; }
+        public string Address { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/Grp_VisaCommission.cs

@@ -0,0 +1,29 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Grp_VisaCommission
+    {
+        public int Id { get; set; }
+        public Nullable<int> DiId { get; set; }
+        public Nullable<int> UId { get; set; }
+        public string Country { get; set; }
+        public Nullable<int> Quantity { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/Grp_VisitingClients.cs

@@ -0,0 +1,32 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Grp_VisitingClients
+    {
+        public int Id { get; set; }
+        public Nullable<int> DiId { get; set; }
+        public Nullable<System.DateTime> BeginDt { get; set; }
+        public Nullable<System.DateTime> EndDt { get; set; }
+        public string CustomerUnit { get; set; }
+        public string CustomerJob { get; set; }
+        public string CustomerName { get; set; }
+        public string CustomerContact { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/Home.cs

@@ -1081,6 +1081,9 @@ namespace travelExport
                             //邀请公务资料
                             //var listgwzl = db.Grp_InvitationOfficialActivities.Where(x => x.DiId == diid && x.IsDel == 0).ToList();
 
+                            //团组餐食信息
+                            var listMeal = db.Grp_RestaurantInfo.Where(x => x.GroupId == diid && x.IsDel == 0).ToList();
+
                             Grp_HotelReservations lastHotel = null;
 
                             foreach (var item in timeArr)
@@ -1398,7 +1401,16 @@ namespace travelExport
 
                                     if (time.Hour < 13)
                                     {
-                                        trip += $"\r\n{time.ToString("HH:mm")} 午餐于当地餐厅;";
+                                        var mealInfo = GetTimeMealInfo(ref listMeal, new DateTime(time.Year, time.Month, time.Day, 12, 00, 00));
+
+                                        if (!string.IsNullOrWhiteSpace(mealInfo))
+                                        {
+                                            trip += $"\r\n{mealInfo}";
+                                        }
+                                        else
+                                        {
+                                            trip += $"\r\n{time.ToString("HH:mm")} 午餐于当地餐厅;";
+                                        }
                                     }
 
                                     if (time < new DateTime(time.Year, time.Month, time.Day, 14, 30, 0))
@@ -1430,7 +1442,17 @@ namespace travelExport
 
                                     if (time.Hour < 18)
                                     {
-                                        trip += $"\r\n18:00 晚餐于当地餐厅;";
+
+                                        var mealInfo = GetTimeMealInfo(ref listMeal, new DateTime(time.Year, time.Month, time.Day, 18, 00, 00));
+
+                                        if (!string.IsNullOrWhiteSpace(mealInfo))
+                                        {
+                                            trip += $"\r\n{mealInfo}";
+                                        }
+                                        else
+                                        {
+                                            trip += $"\r\n18:00 晚餐于当地餐厅;";
+                                        }
                                     }
 
                                     //time = time.AddHours(1);
@@ -1490,6 +1512,20 @@ namespace travelExport
                                     var halfPasTen = GetTimeGwInfo(ref listgw, new DateTime(time.Year, time.Month, time.Day, 10, 30, 00));
                                     var twoPointsPM = GetTimeGwInfo(ref listgw, new DateTime(time.Year, time.Month, time.Day, 14, 00, 00));
                                     var fourPointsPM = GetTimeGwInfo(ref listgw, new DateTime(time.Year, time.Month, time.Day, 16, 00, 00));
+
+                                    var mealInfo = GetTimeMealInfo(ref listMeal, new DateTime(time.Year, time.Month, time.Day, 12, 00, 00));
+                                    var mealInfoPM = GetTimeMealInfo(ref listMeal, new DateTime(time.Year, time.Month, time.Day, 18, 00, 00));
+
+                                    if (!string.IsNullOrWhiteSpace(mealInfo))
+                                    {
+                                        trip = trip.Replace("12:00 午餐于当地餐厅", mealInfo);
+                                    }
+
+                                    if (!string.IsNullOrWhiteSpace(mealInfoPM))
+                                    {
+                                        trip = trip.Replace("18:00 晚餐于当地餐厅", mealInfoPM);
+                                    }
+
                                     if (!string.IsNullOrWhiteSpace(nineTime))
                                     {
                                         trip = trip.Replace("09:00 公务活动", nineTime);
@@ -2566,6 +2602,13 @@ namespace travelExport
                 Country = x.Country,
                 Field = x.Field,
                 ReqSample = x.ReqSample,
+                ConfirmTheInvitation = x.ConfirmTheInvitation,
+                DataId = x.DataId,
+                DataSource = x.DataSource,
+                EmailOrWeChat = x.EmailOrWeChat,
+                Nature = x.Nature,
+                ScreenshotOfMailUrl = x.ScreenshotOfMailUrl,
+                Website = x.Website,
             }).ToList();
 
             string info = string.Empty;
@@ -2589,7 +2632,7 @@ namespace travelExport
             foreach (var g in dayArr)
             {
                 var thisData = g.GetDateTime;
-                if (thisData.Hour == gwTime.Hour && thisData.Minute == gwTime.Hour)
+                if (thisData.Hour == gwTime.Hour && thisData.Minute == gwTime.Minute)
                 {
                     isFindTimeGw = true;
                     newGwTime = thisData;
@@ -2623,9 +2666,96 @@ namespace travelExport
                     }
                 }
             }
+
+            //1335    客人
+            //1334    公司
+
+            if (isFindTimeGw)
+            {
+                if(gl.DataSource == 0 || gl.DataSource == 1334 || gl.DataSource == null)
+                {
+                    info += "【泛美资源】";
+                }
+                else
+                {
+                    info += "【客人资源】";
+                }
+            }
+
             return info;
         }
 
+        string GetTimeMealInfo(ref List<Grp_RestaurantInfo> listMeal, DateTime mealTime)
+        {
+            string info = string.Empty;
+
+            List<Grp_RestaurantInfo> dayArr = new List<Grp_RestaurantInfo>();
+
+            Grp_RestaurantInfo gl = null;
+
+            var startStr = "午餐于当地餐厅";
+            if (mealTime.Hour == 18 && mealTime.Minute == 0)
+            {
+                startStr = "晚餐于当地餐厅";
+            }
+            
+            foreach (var g in listMeal)
+            {
+                var parseTime_Bool = DateTime.TryParse(g.Date,out DateTime parseTime) ;
+                if (parseTime_Bool && parseTime.Year == mealTime.Year && parseTime.Month == mealTime.Month && parseTime.Day == mealTime.Day)
+                {
+                    dayArr.Add(g);
+                }
+            }
+
+            var isFindTimeGw = false;
+            foreach (var g in dayArr)
+            {
+                var thisData = DateTime.Parse(g.StartTime);
+                if (thisData.Hour == mealTime.Hour && thisData.Minute == mealTime.Minute)
+                {
+                    isFindTimeGw = true;
+                    info += $"{g.StartTime}{(!string.IsNullOrWhiteSpace(g.EndTime) ? "-" + g.EndTime + " " : " ")}{startStr}" +
+                       $"{(!string.IsNullOrWhiteSpace(g.Name) ? "(" + g.Name + ") " : "")}{(!string.IsNullOrWhiteSpace(g.Address) ? "(地址: " + g.Address +" " : "")}" +
+                       $"{(!string.IsNullOrWhiteSpace(g.Tel) ? "联系电话：" + g.Tel + " " : "")}" +
+                       $"{(!string.IsNullOrWhiteSpace(g.Remark) ? "其他信息：" + g.Remark : "")}" + ")";
+                    listMeal.Remove(listMeal.Find(x => x.Id == g.Id));
+                    gl = g;
+                    break;
+                }
+            }
+
+            //查询时间最接近的
+            if (!isFindTimeGw)
+            {
+                var g = dayArr.OrderBy(x =>
+                {
+                    return (DateTime.Parse(x.StartTime) - mealTime).Duration();
+                }).FirstOrDefault();
+
+                if (g != null)
+                {
+                    var thisData = DateTime.Parse(g.StartTime);
+                    if ((thisData - mealTime) < new TimeSpan(3, 0, 0))
+                    {
+                        isFindTimeGw = true;
+                        info += $"{g.StartTime}{(!string.IsNullOrWhiteSpace(g.EndTime) ? "-" + g.EndTime+" " : " ")}{startStr}" +
+                        $"{(!string.IsNullOrWhiteSpace(g.Name) ? "(" + g.Name + ") " : "")}{(!string.IsNullOrWhiteSpace(g.Address) ? "(地址: " + g.Address + " " : "")}" +
+                        $"{(!string.IsNullOrWhiteSpace(g.Tel) ? "联系电话：" + g.Tel+" " : "")}" +
+                        $"{(!string.IsNullOrWhiteSpace(g.Remark) ? "其他信息：" + g.Remark: "")}" + ")";
+                        listMeal.Remove(listMeal.Find(x => x.Id == g.Id));
+                        gl = g;
+                    }
+                }
+            }
+
+            if (info.Contains("))"))
+            {
+                info = info.Replace("))", ")");
+            }
+
+            return info;
+        }
 
         void CheckAndCenterParagraphs(Document doc)
         {

travelExport/Per_AssessmentContentSetting.cs

@@ -0,0 +1,31 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Per_AssessmentContentSetting
+    {
+        public int Id { get; set; }
+        public int AssessmentSettingId { get; set; }
+        public decimal AssessmentProportionChi { get; set; }
+        public string TargetValue { get; set; }
+        public int JobId { get; set; }
+        public int UserId { get; set; }
+        public int Fixed { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/Per_AssessmentScore.cs

@@ -0,0 +1,35 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Per_AssessmentScore
+    {
+        public int Id { get; set; }
+        public Nullable<System.DateTime> YearMonth { get; set; }
+        public Nullable<int> AssessmentContentSettingId { get; set; }
+        public string Status { get; set; }
+        public Nullable<decimal> SelfAssessment { get; set; }
+        public Nullable<decimal> HigherUpAssessment { get; set; }
+        public Nullable<decimal> Score { get; set; }
+        public Nullable<decimal> ScoreTotal { get; set; }
+        public Nullable<int> HigherUpConfig { get; set; }
+        public Nullable<int> HigherUpUserId { get; set; }
+        public string Details { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/Per_AssessmentSetting.cs

@@ -0,0 +1,29 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Per_AssessmentSetting
+    {
+        public int Id { get; set; }
+        public string Name { get; set; }
+        public decimal AssessmentProportion { get; set; }
+        public string AssessmentStandard { get; set; }
+        public int ParentId { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/Pm_GoodsInfo.cs

@@ -0,0 +1,34 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Pm_GoodsInfo
+    {
+        public int Id { get; set; }
+        public Nullable<int> Type { get; set; }
+        public string Name { get; set; }
+        public Nullable<decimal> SQ_Total { get; set; }
+        public Nullable<decimal> OQ_Total { get; set; }
+        public Nullable<decimal> PriceTotal { get; set; }
+        public Nullable<decimal> StockQuantity { get; set; }
+        public string Unit { get; set; }
+        public Nullable<int> LastUpdateUserId { get; set; }
+        public Nullable<System.DateTime> LastUpdateTime { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/Pm_GoodsReceive.cs

@@ -0,0 +1,33 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Pm_GoodsReceive
+    {
+        public int Id { get; set; }
+        public Nullable<int> GroupId { get; set; }
+        public Nullable<int> GoodsId { get; set; }
+        public Nullable<decimal> Quantity { get; set; }
+        public string Reason { get; set; }
+        public string GoodsStorageInfo { get; set; }
+        public Nullable<int> AuditStatus { get; set; }
+        public Nullable<int> AuditUserId { get; set; }
+        public Nullable<System.DateTime> AuditTime { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/Pm_GoodsStorage.cs

@@ -0,0 +1,37 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Pm_GoodsStorage
+    {
+        public int Id { get; set; }
+        public Nullable<int> GoodsId { get; set; }
+        public string BatchNo { get; set; }
+        public Nullable<decimal> ReceiveQuantity { get; set; }
+        public Nullable<decimal> Quantity { get; set; }
+        public Nullable<decimal> UnitPrice { get; set; }
+        public Nullable<decimal> TotalPrice { get; set; }
+        public string SupplierName { get; set; }
+        public string SupplierTel { get; set; }
+        public string SupplierAddress { get; set; }
+        public string SupplierSource { get; set; }
+        public Nullable<int> StorageUserId { get; set; }
+        public string StorageTime { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/Res_BasicInsuranceCost.cs

@@ -0,0 +1,28 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Res_BasicInsuranceCost
+    {
+        public int Id { get; set; }
+        public int IsSchengen { get; set; }
+        public string CountryName { get; set; }
+        public decimal Cost { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/Res_InvitationOfficialActivityData_Data.cs

@@ -0,0 +1,47 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Res_InvitationOfficialActivityData_Data
+    {
+        public int Id { get; set; }
+        public string Country { get; set; }
+        public string City { get; set; }
+        public string UnitName { get; set; }
+        public string UnitWeb { get; set; }
+        public string Field { get; set; }
+        public string Address { get; set; }
+        public string UnitInfo { get; set; }
+        public string Contact { get; set; }
+        public string Job { get; set; }
+        public string Tel { get; set; }
+        public string Email { get; set; }
+        public string WeChat { get; set; }
+        public string FaceBook { get; set; }
+        public string Ins { get; set; }
+        public string Delegation { get; set; }
+        public string FileName { get; set; }
+        public string FilePath { get; set; }
+        public string SndFileName { get; set; }
+        public string SndFilePath { get; set; }
+        public string Fax { get; set; }
+        public string OtherInfo { get; set; }
+        public string Background { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/Res_MediaSuppliers.cs

@@ -0,0 +1,38 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Res_MediaSuppliers
+    {
+        public int Id { get; set; }
+        public Nullable<int> TypeId { get; set; }
+        public string Privince { get; set; }
+        public string City { get; set; }
+        public string UnitName { get; set; }
+        public string UnitAbbreviation { get; set; }
+        public string UnitAddress { get; set; }
+        public string Contact { get; set; }
+        public Nullable<int> Sex { get; set; }
+        public string Post { get; set; }
+        public string Fax { get; set; }
+        public string Tel { get; set; }
+        public string Email { get; set; }
+        public string WeChat { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/Res_TranslatorLibrary.cs

@@ -0,0 +1,37 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Res_TranslatorLibrary
+    {
+        public int Id { get; set; }
+        public string Area { get; set; }
+        public string Name { get; set; }
+        public Nullable<int> Sex { get; set; }
+        public string Photo { get; set; }
+        public string Tel { get; set; }
+        public string Email { get; set; }
+        public string WechatNo { get; set; }
+        public string OtherSocialAccounts { get; set; }
+        public string Language { get; set; }
+        public Nullable<decimal> Price { get; set; }
+        public Nullable<int> Currency { get; set; }
+        public string Files { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/Res_TranslatorLibrary_Encryption.cs

@@ -0,0 +1,37 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Res_TranslatorLibrary_Encryption
+    {
+        public int Id { get; set; }
+        public string Area { get; set; }
+        public string Name { get; set; }
+        public Nullable<int> Sex { get; set; }
+        public string Photo { get; set; }
+        public string Tel { get; set; }
+        public string Email { get; set; }
+        public string WechatNo { get; set; }
+        public string OtherSocialAccounts { get; set; }
+        public string Language { get; set; }
+        public Nullable<decimal> Price { get; set; }
+        public Nullable<int> Currency { get; set; }
+        public string Files { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/Sys_Cities.cs

@@ -0,0 +1,32 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Sys_Cities
+    {
+        public int Id { get; set; }
+        public Nullable<int> CountriesId { get; set; }
+        public string Name_CN { get; set; }
+        public string Name_EN { get; set; }
+        public string ThreeCode { get; set; }
+        public Nullable<int> IsCapital { get; set; }
+        public Nullable<int> ParentId { get; set; }
+        public Nullable<int> Level { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/Sys_Continent.cs

@@ -0,0 +1,27 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Sys_Continent
+    {
+        public int Id { get; set; }
+        public string Name_CN { get; set; }
+        public string Name_EN { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/Sys_Countries.cs

@@ -0,0 +1,31 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Sys_Countries
+    {
+        public int Id { get; set; }
+        public Nullable<int> ContinentId { get; set; }
+        public string ThreeCode { get; set; }
+        public string Name_CN { get; set; }
+        public string Name_CN_Full { get; set; }
+        public string Name_EN { get; set; }
+        public string Name_EN_Full { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/Sys_DeviceToken.cs

@@ -0,0 +1,27 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Sys_DeviceToken
+    {
+        public int Id { get; set; }
+        public string Number { get; set; }
+        public string DeviceToken { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/Sys_ExchangeRateRecord.cs

@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Sys_ExchangeRateRecord
+    {
+        public int Id { get; set; }
+        public Nullable<int> DiId { get; set; }
+        public string LinkModule { get; set; }
+        public Nullable<System.DateTime> RateDateTime { get; set; }
+        public Nullable<int> RateDataSource { get; set; }
+        public string RateInfo { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/Sys_Users_Encryption.cs

@@ -0,0 +1,55 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace travelExport
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Sys_Users_Encryption
+    {
+        public int Id { get; set; }
+        public string CnName { get; set; }
+        public string EnName { get; set; }
+        public string Number { get; set; }
+        public Nullable<int> CompanyId { get; set; }
+        public Nullable<int> DepId { get; set; }
+        public Nullable<int> JobPostId { get; set; }
+        public string Password { get; set; }
+        public Nullable<int> Sex { get; set; }
+        public string Ext { get; set; }
+        public string Phone { get; set; }
+        public string UrgentPhone { get; set; }
+        public string Email { get; set; }
+        public string Address { get; set; }
+        public Nullable<System.DateTime> Edate { get; set; }
+        public Nullable<System.DateTime> Rdate { get; set; }
+        public Nullable<int> Seniority { get; set; }
+        public Nullable<System.DateTime> Birthday { get; set; }
+        public string IDCard { get; set; }
+        public string StartWorkDate { get; set; }
+        public string GraduateInstitutions { get; set; }
+        public string Professional { get; set; }
+        public Nullable<int> Education { get; set; }
+        public Nullable<int> TheOrAdultEducation { get; set; }
+        public string MaritalStatus { get; set; }
+        public string HomeAddress { get; set; }
+        public string UsePeriod { get; set; }
+        public string WorkExperience { get; set; }
+        public string Certificate { get; set; }
+        public Nullable<int> HrAudit { get; set; }
+        public string QiyeChatUserId { get; set; }
+        public Nullable<int> CreateUserId { get; set; }
+        public Nullable<System.DateTime> CreateTime { get; set; }
+        public Nullable<int> DeleteUserId { get; set; }
+        public string DeleteTime { get; set; }
+        public string Remark { get; set; }
+        public Nullable<int> IsDel { get; set; }
+    }
+}

travelExport/travelExport.csproj

@@ -85,21 +85,33 @@
     <Compile Include="Crm_CustomerCert.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
+    <Compile Include="Crm_CustomerCert_Data.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
     <Compile Include="Crm_CustomerCompany.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
+    <Compile Include="Crm_CustomerCompany_Data.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
     <Compile Include="Crm_CustomerFile.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
     <Compile Include="Crm_DeleClient.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
+    <Compile Include="Crm_DeleClient_Data.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
     <Compile Include="Crm_GroupCustomer.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
     <Compile Include="Crm_NewClientData.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
+    <Compile Include="Crm_NewClientData_Encryption.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
     <Compile Include="Crm_TableOperationRecord.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
@@ -151,21 +163,78 @@
     <Compile Include="Fin_GroupExtraCost.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
+    <Compile Include="Fin_LocalGuideRelevancyOverspend.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
     <Compile Include="Fin_OtherPrice.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
+    <Compile Include="Fin_OverSpendRelevancyCollectionStatement.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
     <Compile Include="Fin_PaymentRefundAndOtherMoney.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
     <Compile Include="Fin_ProceedsReceived.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
+    <Compile Include="Fin_RoyaltyConfirm.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
+    <Compile Include="Fin_RoyaltyForm.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
+    <Compile Include="Grp_ApprovalTravel.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
+    <Compile Include="Grp_ApprovalTravelDetails.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
+    <Compile Include="Grp_DayAndCostDraft.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
+    <Compile Include="Grp_DayOtherPrice.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
+    <Compile Include="Grp_DayOtherPriceDraft.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
+    <Compile Include="Grp_EnterExitCostDraft.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
+    <Compile Include="Grp_EnterExitCostDraftPermission.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
+    <Compile Include="Grp_EnterExitCostPermission.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
+    <Compile Include="Grp_GroupModelFile.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
     <Compile Include="Grp_HotelInquiry.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
+    <Compile Include="Grp_HotelReservationsContent.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
+    <Compile Include="Grp_OfficialDutyLinkTranslator.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
+    <Compile Include="Grp_Opinionaire.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
+    <Compile Include="Grp_RestaurantInfo.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
+    <Compile Include="Grp_VisaCommission.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
     <Compile Include="Grp_VisaInfo.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
+    <Compile Include="Grp_VisitingClients.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
     <Compile Include="Home.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -301,6 +370,24 @@
     <Compile Include="Grp_VisaProgressCustomerPicture.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
+    <Compile Include="Per_AssessmentContentSetting.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
+    <Compile Include="Per_AssessmentScore.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
+    <Compile Include="Per_AssessmentSetting.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
+    <Compile Include="Pm_GoodsInfo.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
+    <Compile Include="Pm_GoodsReceive.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
+    <Compile Include="Pm_GoodsStorage.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
     <Compile Include="Pm_TaskAllocation.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
@@ -333,6 +420,9 @@
     <Compile Include="Res_AskData.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
+    <Compile Include="Res_BasicInsuranceCost.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
     <Compile Include="Res_CarData.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
@@ -357,6 +447,9 @@
     <Compile Include="Res_InvitationOfficialActivityData.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
+    <Compile Include="Res_InvitationOfficialActivityData_Data.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
     <Compile Include="Res_ItemDetail.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
@@ -369,6 +462,9 @@
     <Compile Include="Res_LocalGuideData.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
+    <Compile Include="Res_MediaSuppliers.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
     <Compile Include="Res_Memo.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
@@ -387,6 +483,12 @@
     <Compile Include="Res_ThreeCode.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
+    <Compile Include="Res_TranslatorLibrary.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
+    <Compile Include="Res_TranslatorLibrary_Encryption.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
     <Compile Include="show.cs" />
     <Compile Include="sysdiagrams.cs">
       <DependentUpon>DB.tt</DependentUpon>
@@ -394,12 +496,27 @@
     <Compile Include="Sys_Calendar.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
+    <Compile Include="Sys_Cities.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
     <Compile Include="Sys_Company.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
+    <Compile Include="Sys_Continent.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
+    <Compile Include="Sys_Countries.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
     <Compile Include="Sys_Department.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
+    <Compile Include="Sys_DeviceToken.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
+    <Compile Include="Sys_ExchangeRateRecord.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
     <Compile Include="Sys_JobPost.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
@@ -433,6 +550,9 @@
     <Compile Include="Sys_Users.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
+    <Compile Include="Sys_Users_Encryption.cs">
+      <DependentUpon>DB.tt</DependentUpon>
+    </Compile>
     <Compile Include="utility\versions.cs" />
     <EmbeddedResource Include="Home.resx">
       <DependentUpon>Home.cs</DependentUpon>