瀏覽代碼

更新数据模型,助利宝的

lichunlei 2 年之前
父節點
當前提交
05c336eb59

+ 10 - 4
AppStart/Helper/AlipayPayBack2Service.cs

@@ -117,16 +117,16 @@ namespace MySystem
                         pro.ProductId = order.ProductId;
                     }
                     List<int> couponIds = new List<int>();
-                    if (pro.ProductId == 10 || pro.ProductId == 11 || pro.ProductId == 27 || pro.ProductId == 28)
+                    if (pro.ProductId == 10 || pro.ProductId == 11 || pro.ProductId == 27 || pro.ProductId == 28 || pro.ProductId == -1 || pro.ProductId == -2)
                     {
                         order.Status = 2;
                         int BuyCount = pro.ProductCount;
                         int Kind = 0;
-                        if (pro.ProductId == 10)
+                        if (pro.ProductId == 10 || pro.ProductId == -1)
                         {
                             Kind = 1;
                         }
-                        else if (pro.ProductId == 11)
+                        else if (pro.ProductId == 11 || pro.ProductId == -2)
                         {
                             Kind = 2;
                         }
@@ -146,7 +146,7 @@ namespace MySystem
                                 user.LeaderLevel = 2;
                             }
                         }
-                        if(Kind <= 2 && pro.ProductId == 10 || pro.ProductId == 11)
+                        if(Kind <= 2 && pro.ProductId == 10 || pro.ProductId == 11 || pro.ProductId == -1 || pro.ProductId == -2)
                         {
                             // 购买600一组机具券,返券
                             int CouponCount = 0;
@@ -168,6 +168,12 @@ namespace MySystem
                                     item.CreateDate = DateTime.Now;
                                     item.UserId = order.UserId;
                                     item.UpdateDate = DateTime.Now.AddDays(180);
+                                    if(pro.ProductId == -1 || pro.ProductId == -2)
+                                    {
+                                        item.IsUse = 1;
+                                        item.UseDate = DateTime.Now;
+                                        item.HelpProfitFlag = 1;
+                                    }
                                     Codes += item.ExchangeCode + ",";
                                     couponIds.Add(coupon.Id);
                                 }

+ 3 - 0
PxcModels/AppBottomNavs.cs

@@ -25,5 +25,8 @@ namespace MySystem.PxcModels
         public string NormalIcon { get; set; }
         public string SelectIcon { get; set; }
         public string Title { get; set; }
+        public string PagPath { get; set; }
+        public string ScrollerAnimationImages { get; set; }
+        public string Style { get; set; }
     }
 }

+ 47 - 0
PxcModels/BrokenMachineChange.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class BrokenMachineChange
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public string OutStoreManagerMobile { get; set; }
+        public string OutStoreManager { get; set; }
+        public string OutStoreAddress { get; set; }
+        public string OutStoreAreas { get; set; }
+        public string OutStoreName { get; set; }
+        public int OutStoreId { get; set; }
+        public string OutProductName { get; set; }
+        public int OutProductType { get; set; }
+        public int BackStoreUserId { get; set; }
+        public string Remark { get; set; }
+        public string BackStoreName { get; set; }
+        public int BackStoreId { get; set; }
+        public string ChangeSnExpand { get; set; }
+        public string OrderExpand { get; set; }
+        public DateTime? CompleteTime { get; set; }
+        public string AuditRemark { get; set; }
+        public int AuditResult { get; set; }
+        public DateTime? AuditTime { get; set; }
+        public string AuditBy { get; set; }
+        public DateTime? ChangeTime { get; set; }
+        public int ChangeDeviceNum { get; set; }
+        public string ChangeDeviceName { get; set; }
+        public string BackProductName { get; set; }
+        public int BackProductType { get; set; }
+        public int UserId { get; set; }
+        public string ChangeNo { get; set; }
+    }
+}

+ 34 - 0
PxcModels/BrokenMachineChangeDetail.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class BrokenMachineChangeDetail
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public int BackSnType { get; set; }
+        public string Remark { get; set; }
+        public int OutSnType { get; set; }
+        public string OutSnNo { get; set; }
+        public string OutProductName { get; set; }
+        public int OutProductType { get; set; }
+        public int BackDeviceStatus { get; set; }
+        public string BackSnNo { get; set; }
+        public int UserId { get; set; }
+        public string BackProductName { get; set; }
+        public int BackProductType { get; set; }
+        public int ChangeId { get; set; }
+        public string ChangeNo { get; set; }
+    }
+}

+ 33 - 0
PxcModels/HelpProfitReward.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class HelpProfitReward
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public int TopUserId { get; set; }
+        public int CheckStatus { get; set; }
+        public int RewardMerCount { get; set; }
+        public string Remark { get; set; }
+        public string RewardDesc { get; set; }
+        public string OpenRewardNo { get; set; }
+        public decimal DebitRewardAmount { get; set; }
+        public decimal CreditRewardAmount { get; set; }
+        public decimal DebitTradeAmt { get; set; }
+        public decimal CreditTradeAmt { get; set; }
+        public int RewardType { get; set; }
+        public int BrandId { get; set; }
+        public int UserId { get; set; }
+        public DateTime? TradeDate { get; set; }
+        public string TradeMonth { get; set; }
+    }
+}

+ 44 - 0
PxcModels/HelpProfitRewardDetail.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class HelpProfitRewardDetail
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public int TopUserId { get; set; }
+        public int CheckStatus { get; set; }
+        public string OpenDetailRec { get; set; }
+        public string Remark { get; set; }
+        public string RewardDesc { get; set; }
+        public string OpenRewardNo { get; set; }
+        public decimal DebitRewardAmount { get; set; }
+        public decimal CreditRewardAmount { get; set; }
+        public decimal DebitTradeAmt { get; set; }
+        public decimal CreditTradeAmt { get; set; }
+        public string RewardTips { get; set; }
+        public int RewardType { get; set; }
+        public int MerBuddyType { get; set; }
+        public int SnStoreId { get; set; }
+        public DateTime? StandardDate { get; set; }
+        public int SnApplyUserId { get; set; }
+        public int SnType { get; set; }
+        public string MerNo { get; set; }
+        public string SnNo { get; set; }
+        public int DirectUserId { get; set; }
+        public int MerchantId { get; set; }
+        public string ProductName { get; set; }
+        public int BrandId { get; set; }
+        public int UserId { get; set; }
+        public DateTime? TradeDate { get; set; }
+        public string TradeMonth { get; set; }
+    }
+}

+ 3 - 0
PxcModels/PosCoupons.cs

@@ -20,5 +20,8 @@ namespace MySystem.PxcModels
         public string ExchangeCode { get; set; }
         public int UserId { get; set; }
         public int LeaderUserId { get; set; }
+        public int HelpProfitMerchantId { get; set; }
+        public int HelpProfitStatus { get; set; }
+        public ulong HelpProfitFlag { get; set; }
     }
 }

+ 36 - 0
PxcModels/ProfitRewardExport.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class ProfitRewardExport
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public decimal DebitTradeProfit { get; set; }
+        public decimal DebitTradeAmt { get; set; }
+        public decimal NotHelpCreditTradeProfit { get; set; }
+        public decimal NotHelpCreditTradeAmt { get; set; }
+        public decimal HelpCreditTradeProfit { get; set; }
+        public decimal HelpCreditTradeAmt { get; set; }
+        public decimal NonQrCreditTradeProfit { get; set; }
+        public decimal NonQrCreditTradeAmt { get; set; }
+        public decimal QrCreditTradeProfit { get; set; }
+        public decimal QrCreditTradeAmt { get; set; }
+        public decimal CreditTradeProfit { get; set; }
+        public decimal CreditTradeAmt { get; set; }
+        public string BrandName { get; set; }
+        public string DirectFlag { get; set; }
+        public int Rank { get; set; }
+        public int UserLevel { get; set; }
+        public string RealName { get; set; }
+        public string MakerCode { get; set; }
+    }
+}

+ 77 - 0
PxcModels/ProfitRewardRecordCopy1.cs

@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class ProfitRewardRecordCopy1
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public int TopUserId { get; set; }
+        public string RecordNo { get; set; }
+        public string TradeMonth { get; set; }
+        public string Remark { get; set; }
+        public int CheckStatus { get; set; }
+        public decimal QrDebitAddOrSubRate { get; set; }
+        public decimal QrDebitProfitStandardRate { get; set; }
+        public decimal QrDebitProfitRate { get; set; }
+        public decimal QrCreditAddOrSubRate { get; set; }
+        public decimal QrCreditProfitStandardRate { get; set; }
+        public decimal QrCreditProfitRate { get; set; }
+        public decimal DebitCapSingleReward { get; set; }
+        public decimal HelpDebitAddOrSubRate { get; set; }
+        public decimal HelpDebitProfitStandardRate { get; set; }
+        public decimal HelpDebitProfitRate { get; set; }
+        public decimal NotHelpDebitAddOrSubRate { get; set; }
+        public decimal NotHelpDebitProfitStandardRate { get; set; }
+        public decimal NotHelpDebitProfitRate { get; set; }
+        public decimal HelpCreditAddOrSubRate { get; set; }
+        public decimal HelpCreditProfitStandardRate { get; set; }
+        public decimal HelpCreditProfitRate { get; set; }
+        public decimal NotHelpCreditAddOrSubRate { get; set; }
+        public decimal NotHelpCreditProfitStandardRate { get; set; }
+        public decimal NotHelpCreditProfitRate { get; set; }
+        public decimal DebitTradeCapProfit { get; set; }
+        public decimal HelpDebitNonTradeCapProfit { get; set; }
+        public decimal NotHelpDebitNonTradeCapProfit { get; set; }
+        public decimal NonQrDebitNonTradeCapProfit { get; set; }
+        public decimal QrDebitNonTradeCapProfit { get; set; }
+        public decimal DebitNonTradeCapProfit { get; set; }
+        public decimal HelpCreditTradeProfit { get; set; }
+        public decimal NotHelpCreditTradeProfit { get; set; }
+        public decimal NonQrCreditTradeProfit { get; set; }
+        public decimal QrCreditTradeProfit { get; set; }
+        public decimal CreditTradeProfit { get; set; }
+        public decimal TradeProfit { get; set; }
+        public int DebitCapTradeNum { get; set; }
+        public decimal DebitCapTradeAmt { get; set; }
+        public decimal HelpDebitNonCapTradeAmt { get; set; }
+        public decimal NotHelpDebitNonCapTradeAmt { get; set; }
+        public decimal NonQrDebitNotCapTradeAmt { get; set; }
+        public decimal QrDebitNotCapTradeAmt { get; set; }
+        public decimal DebitNonCapTradeAmt { get; set; }
+        public decimal HelpCreditTradeAmt { get; set; }
+        public decimal NotHelpCreditTradeAmt { get; set; }
+        public decimal NonQrCreditTradeAmt { get; set; }
+        public decimal QrCreditTradeAmt { get; set; }
+        public decimal CreditTradeAmt { get; set; }
+        public decimal TradeAmt { get; set; }
+        public decimal OtherDebitNotCapTradeAmt { get; set; }
+        public decimal OtherCreditTradeAmt { get; set; }
+        public decimal OtherTradeAmt { get; set; }
+        public int ProfitType { get; set; }
+        public int BrandId { get; set; }
+        public int MerchantId { get; set; }
+        public int UserId { get; set; }
+    }
+}

+ 41 - 0
PxcModels/ProfitSubsidyDetailCopy1.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class ProfitSubsidyDetailCopy1
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public string Remark { get; set; }
+        public decimal SubsidyProfit { get; set; }
+        public decimal SubsidyProfitRate { get; set; }
+        public decimal CreditProfitRate { get; set; }
+        public decimal NonQrCreditTradeAmt { get; set; }
+        public decimal QrCreditTradeAmt { get; set; }
+        public decimal CreditTradeAmt { get; set; }
+        public int SubsidyType { get; set; }
+        public int SubsidyUserId { get; set; }
+        public ulong MerHelpFlag { get; set; }
+        public int BelongUserId { get; set; }
+        public DateTime? MerStandardDate { get; set; }
+        public DateTime? MerRegTime { get; set; }
+        public string SnNo { get; set; }
+        public string MerNo { get; set; }
+        public int MerchantId { get; set; }
+        public string TradeMonth { get; set; }
+        public string ProductName { get; set; }
+        public int BrandId { get; set; }
+        public string RecordNo { get; set; }
+    }
+}

+ 28 - 0
PxcModels/ProfitSubsidyExport.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class ProfitSubsidyExport
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public decimal SubsidyProfit { get; set; }
+        public decimal CreditTradeAmt { get; set; }
+        public string BrandName { get; set; }
+        public string DirectFlag { get; set; }
+        public string MerchantName { get; set; }
+        public string KqSnNo { get; set; }
+        public int Rank { get; set; }
+        public int UserLevel { get; set; }
+        public string RealName { get; set; }
+        public string MakerCode { get; set; }
+    }
+}

+ 23 - 0
PxcModels/SchoolMakerStudy.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class SchoolMakerStudy
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public string Url { get; set; }
+        public string Contents { get; set; }
+        public string ListPic { get; set; }
+        public string Detail { get; set; }
+        public string Title { get; set; }
+    }
+}

+ 24 - 0
PxcModels/SchoolMorningMeet.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class SchoolMorningMeet
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public string Contents { get; set; }
+        public string Url { get; set; }
+        public int StudyPerson { get; set; }
+        public string Photo { get; set; }
+        public string Lecturer { get; set; }
+        public string Title { get; set; }
+    }
+}

+ 20 - 0
PxcModels/SchoolMorningMeetLog.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class SchoolMorningMeetLog
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public int UserId { get; set; }
+        public int MeetId { get; set; }
+    }
+}

+ 1012 - 8
PxcModels/WebCMSEntities.cs

@@ -30,6 +30,8 @@ namespace MySystem.PxcModels
         public virtual DbSet<AppVideoList> AppVideoList { get; set; }
         public virtual DbSet<BackEndOpRecord> BackEndOpRecord { get; set; }
         public virtual DbSet<BankInfo> BankInfo { get; set; }
+        public virtual DbSet<BrokenMachineChange> BrokenMachineChange { get; set; }
+        public virtual DbSet<BrokenMachineChangeDetail> BrokenMachineChangeDetail { get; set; }
         public virtual DbSet<BusinessActSummary> BusinessActSummary { get; set; }
         public virtual DbSet<BusinessPartner> BusinessPartner { get; set; }
         public virtual DbSet<BusinessPartnerMerchant> BusinessPartnerMerchant { get; set; }
@@ -56,6 +58,8 @@ namespace MySystem.PxcModels
         public virtual DbSet<HelpProfitMerTradeSummay> HelpProfitMerTradeSummay { get; set; }
         public virtual DbSet<HelpProfitMerchantForUser> HelpProfitMerchantForUser { get; set; }
         public virtual DbSet<HelpProfitRebateDetail> HelpProfitRebateDetail { get; set; }
+        public virtual DbSet<HelpProfitReward> HelpProfitReward { get; set; }
+        public virtual DbSet<HelpProfitRewardDetail> HelpProfitRewardDetail { get; set; }
         public virtual DbSet<IndexIconList> IndexIconList { get; set; }
         public virtual DbSet<KqProductBrand> KqProductBrand { get; set; }
         public virtual DbSet<KqProductOrgs> KqProductOrgs { get; set; }
@@ -146,8 +150,12 @@ namespace MySystem.PxcModels
         public virtual DbSet<ProfitReceiveRecord> ProfitReceiveRecord { get; set; }
         public virtual DbSet<ProfitReceives> ProfitReceives { get; set; }
         public virtual DbSet<ProfitRecord> ProfitRecord { get; set; }
+        public virtual DbSet<ProfitRewardExport> ProfitRewardExport { get; set; }
         public virtual DbSet<ProfitRewardRecord> ProfitRewardRecord { get; set; }
+        public virtual DbSet<ProfitRewardRecordCopy1> ProfitRewardRecordCopy1 { get; set; }
         public virtual DbSet<ProfitSubsidyDetail> ProfitSubsidyDetail { get; set; }
+        public virtual DbSet<ProfitSubsidyDetailCopy1> ProfitSubsidyDetailCopy1 { get; set; }
+        public virtual DbSet<ProfitSubsidyExport> ProfitSubsidyExport { get; set; }
         public virtual DbSet<PublicAccountSet> PublicAccountSet { get; set; }
         public virtual DbSet<PullNewAct> PullNewAct { get; set; }
         public virtual DbSet<PullNewDetail> PullNewDetail { get; set; }
@@ -155,6 +163,9 @@ namespace MySystem.PxcModels
         public virtual DbSet<RecommendDirectUser> RecommendDirectUser { get; set; }
         public virtual DbSet<RecommendTradeSummary> RecommendTradeSummary { get; set; }
         public virtual DbSet<RightDic> RightDic { get; set; }
+        public virtual DbSet<SchoolMakerStudy> SchoolMakerStudy { get; set; }
+        public virtual DbSet<SchoolMorningMeet> SchoolMorningMeet { get; set; }
+        public virtual DbSet<SchoolMorningMeetLog> SchoolMorningMeetLog { get; set; }
         public virtual DbSet<ServiceCenter> ServiceCenter { get; set; }
         public virtual DbSet<SetMerchantTypeRecord> SetMerchantTypeRecord { get; set; }
         public virtual DbSet<SmallStoreHouse> SmallStoreHouse { get; set; }
@@ -904,6 +915,11 @@ namespace MySystem.PxcModels
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.PagPath)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.PageName)
                     .HasColumnType("varchar(50)")
                     .HasCharSet("utf8")
@@ -911,6 +927,11 @@ namespace MySystem.PxcModels
 
                 entity.Property(e => e.QueryCount).HasColumnType("int(11)");
 
+                entity.Property(e => e.ScrollerAnimationImages)
+                    .HasColumnType("varchar(300)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.SelectIcon)
                     .HasColumnType("varchar(200)")
                     .HasCharSet("utf8")
@@ -940,6 +961,11 @@ namespace MySystem.PxcModels
 
                 entity.Property(e => e.Status).HasColumnType("int(11)");
 
+                entity.Property(e => e.Style)
+                    .HasColumnType("varchar(30)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.Title)
                     .HasColumnType("varchar(10)")
                     .HasCharSet("utf8")
@@ -1297,6 +1323,231 @@ namespace MySystem.PxcModels
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<BrokenMachineChange>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.AuditBy)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.AuditRemark)
+                    .HasColumnType("varchar(128)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.AuditResult).HasColumnType("int(11)");
+
+                entity.Property(e => e.AuditTime).HasColumnType("datetime");
+
+                entity.Property(e => e.BackProductName)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.BackProductType).HasColumnType("int(11)");
+
+                entity.Property(e => e.BackStoreId).HasColumnType("int(11)");
+
+                entity.Property(e => e.BackStoreName)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.BackStoreUserId).HasColumnType("int(11)");
+
+                entity.Property(e => e.ChangeDeviceName)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ChangeDeviceNum).HasColumnType("int(11)");
+
+                entity.Property(e => e.ChangeNo)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ChangeSnExpand)
+                    .HasColumnType("mediumtext")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ChangeTime).HasColumnType("datetime");
+
+                entity.Property(e => e.CompleteTime).HasColumnType("datetime");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.CreateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.OrderExpand)
+                    .HasColumnType("mediumtext")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.OutProductName)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.OutProductType).HasColumnType("int(11)");
+
+                entity.Property(e => e.OutStoreAddress)
+                    .HasColumnType("varchar(128)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.OutStoreAreas)
+                    .HasColumnType("varchar(30)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.OutStoreId).HasColumnType("int(11)");
+
+                entity.Property(e => e.OutStoreManager)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.OutStoreManagerMobile)
+                    .HasColumnType("varchar(11)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.OutStoreName)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.Remark)
+                    .HasColumnType("varchar(64)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort).HasColumnType("int(11)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.UpdateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
+
+                entity.Property(e => e.Version).HasColumnType("int(11)");
+            });
+
+            modelBuilder.Entity<BrokenMachineChangeDetail>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.BackDeviceStatus).HasColumnType("int(11)");
+
+                entity.Property(e => e.BackProductName)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.BackProductType).HasColumnType("int(11)");
+
+                entity.Property(e => e.BackSnNo)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.BackSnType).HasColumnType("int(11)");
+
+                entity.Property(e => e.ChangeId).HasColumnType("int(11)");
+
+                entity.Property(e => e.ChangeNo)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.CreateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.OutProductName)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.OutProductType).HasColumnType("int(11)");
+
+                entity.Property(e => e.OutSnNo)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.OutSnType).HasColumnType("int(11)");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.Remark)
+                    .HasColumnType("varchar(64)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort).HasColumnType("int(11)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.UpdateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
+
+                entity.Property(e => e.Version).HasColumnType("int(11)");
+            });
+
             modelBuilder.Entity<BusinessActSummary>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -3005,25 +3256,206 @@ namespace MySystem.PxcModels
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
-            modelBuilder.Entity<IndexIconList>(entity =>
+            modelBuilder.Entity<HelpProfitReward>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
+                entity.Property(e => e.BrandId).HasColumnType("int(11)");
+
+                entity.Property(e => e.CheckStatus).HasColumnType("int(11)");
+
                 entity.Property(e => e.CreateDate).HasColumnType("datetime");
 
-                entity.Property(e => e.CreateMan)
-                    .HasColumnType("varchar(50)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
+                entity.Property(e => e.CreditRewardAmount).HasColumnType("decimal(18,2)");
 
-                entity.Property(e => e.Icon)
-                    .HasColumnType("varchar(200)")
+                entity.Property(e => e.CreditTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.DebitRewardAmount).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.DebitTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.OpenRewardNo)
+                    .HasColumnType("varchar(32)")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
                 entity.Property(e => e.QueryCount).HasColumnType("int(11)");
 
-                entity.Property(e => e.SeoDescription)
+                entity.Property(e => e.Remark)
+                    .HasColumnType("varchar(128)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.RewardDesc)
+                    .HasColumnType("varchar(128)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.RewardMerCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.RewardType).HasColumnType("int(11)");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort).HasColumnType("int(11)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                entity.Property(e => e.TopUserId).HasColumnType("int(11)");
+
+                entity.Property(e => e.TradeDate).HasColumnType("datetime");
+
+                entity.Property(e => e.TradeMonth)
+                    .HasColumnType("varchar(6)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
+            });
+
+            modelBuilder.Entity<HelpProfitRewardDetail>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.BrandId).HasColumnType("int(11)");
+
+                entity.Property(e => e.CheckStatus).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.CreditRewardAmount).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.CreditTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.DebitRewardAmount).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.DebitTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.DirectUserId).HasColumnType("int(11)");
+
+                entity.Property(e => e.MerBuddyType).HasColumnType("int(11)");
+
+                entity.Property(e => e.MerNo)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.MerchantId).HasColumnType("int(11)");
+
+                entity.Property(e => e.OpenDetailRec)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.OpenRewardNo)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ProductName)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.Remark)
+                    .HasColumnType("varchar(128)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.RewardDesc)
+                    .HasColumnType("varchar(128)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.RewardTips)
+                    .HasColumnType("varchar(16)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.RewardType).HasColumnType("int(11)");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SnApplyUserId).HasColumnType("int(11)");
+
+                entity.Property(e => e.SnNo)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SnStoreId).HasColumnType("int(11)");
+
+                entity.Property(e => e.SnType).HasColumnType("int(11)");
+
+                entity.Property(e => e.Sort).HasColumnType("int(11)");
+
+                entity.Property(e => e.StandardDate).HasColumnType("datetime");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                entity.Property(e => e.TopUserId).HasColumnType("int(11)");
+
+                entity.Property(e => e.TradeDate).HasColumnType("datetime");
+
+                entity.Property(e => e.TradeMonth)
+                    .HasColumnType("varchar(6)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
+            });
+
+            modelBuilder.Entity<IndexIconList>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.CreateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Icon)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.SeoDescription)
                     .HasColumnType("varchar(500)")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
@@ -7534,6 +7966,14 @@ namespace MySystem.PxcModels
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.HelpProfitFlag)
+                    .HasColumnType("bit(1)")
+                    .HasDefaultValueSql("b'0'");
+
+                entity.Property(e => e.HelpProfitMerchantId).HasColumnType("int(11)");
+
+                entity.Property(e => e.HelpProfitStatus).HasColumnType("int(11)");
+
                 entity.Property(e => e.IsLock)
                     .HasColumnType("bit(1)")
                     .HasDefaultValueSql("b'0'");
@@ -7988,6 +8428,9 @@ namespace MySystem.PxcModels
 
             modelBuilder.Entity<PosMerchantTradeSummay>(entity =>
             {
+                entity.HasIndex(e => new { e.MerchantId, e.BrandId, e.TradeMonth, e.TradeDate })
+                    .HasName("PosMerchantTradeSummayIndex");
+
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.BrandId).HasColumnType("int(11)");
@@ -9604,6 +10047,84 @@ namespace MySystem.PxcModels
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<ProfitRewardExport>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.BrandName)
+                    .HasColumnType("varchar(30)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.CreditTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.CreditTradeProfit).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.DebitTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.DebitTradeProfit).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.DirectFlag)
+                    .HasColumnType("varchar(10)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.HelpCreditTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.HelpCreditTradeProfit).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.MakerCode)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.NonQrCreditTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.NonQrCreditTradeProfit).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.NotHelpCreditTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.NotHelpCreditTradeProfit).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.QrCreditTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.QrCreditTradeProfit).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.Rank).HasColumnType("int(11)");
+
+                entity.Property(e => e.RealName)
+                    .HasColumnType("varchar(30)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort).HasColumnType("int(11)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.UserLevel).HasColumnType("int(11)");
+            });
+
             modelBuilder.Entity<ProfitRewardRecord>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -9767,6 +10288,171 @@ namespace MySystem.PxcModels
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<ProfitRewardRecordCopy1>(entity =>
+            {
+                entity.ToTable("ProfitRewardRecord_copy1");
+
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.BrandId).HasColumnType("int(11)");
+
+                entity.Property(e => e.CheckStatus).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.CreateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.CreditTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.CreditTradeProfit).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.DebitCapSingleReward).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.DebitCapTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.DebitCapTradeNum).HasColumnType("int(11)");
+
+                entity.Property(e => e.DebitNonCapTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.DebitNonTradeCapProfit).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.DebitTradeCapProfit).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.HelpCreditAddOrSubRate).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.HelpCreditProfitRate).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.HelpCreditProfitStandardRate).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.HelpCreditTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.HelpCreditTradeProfit).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.HelpDebitAddOrSubRate).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.HelpDebitNonCapTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.HelpDebitNonTradeCapProfit).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.HelpDebitProfitRate).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.HelpDebitProfitStandardRate).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.MerchantId).HasColumnType("int(11)");
+
+                entity.Property(e => e.NonQrCreditTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.NonQrCreditTradeProfit).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.NonQrDebitNonTradeCapProfit).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.NonQrDebitNotCapTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.NotHelpCreditAddOrSubRate).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.NotHelpCreditProfitRate).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.NotHelpCreditProfitStandardRate).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.NotHelpCreditTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.NotHelpCreditTradeProfit).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.NotHelpDebitAddOrSubRate).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.NotHelpDebitNonCapTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.NotHelpDebitNonTradeCapProfit).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.NotHelpDebitProfitRate).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.NotHelpDebitProfitStandardRate).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.OtherCreditTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.OtherDebitNotCapTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.OtherTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ProfitType).HasColumnType("int(11)");
+
+                entity.Property(e => e.QrCreditAddOrSubRate).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.QrCreditProfitRate).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.QrCreditProfitStandardRate).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.QrCreditTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.QrCreditTradeProfit).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.QrDebitAddOrSubRate).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.QrDebitNonTradeCapProfit).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.QrDebitNotCapTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.QrDebitProfitRate).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.QrDebitProfitStandardRate).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.RecordNo)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Remark)
+                    .HasColumnType("varchar(64)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort).HasColumnType("int(11)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                entity.Property(e => e.TopUserId).HasColumnType("int(11)");
+
+                entity.Property(e => e.TradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.TradeMonth)
+                    .HasColumnType("varchar(6)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.TradeProfit).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.UpdateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
+
+                entity.Property(e => e.Version).HasColumnType("int(11)");
+            });
+
             modelBuilder.Entity<ProfitSubsidyDetail>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -9869,6 +10555,178 @@ namespace MySystem.PxcModels
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<ProfitSubsidyDetailCopy1>(entity =>
+            {
+                entity.ToTable("ProfitSubsidyDetail_copy1");
+
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.BelongUserId).HasColumnType("int(11)");
+
+                entity.Property(e => e.BrandId).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.CreateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.CreditProfitRate).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.CreditTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.MerHelpFlag)
+                    .HasColumnType("bit(1)")
+                    .HasDefaultValueSql("b'0'");
+
+                entity.Property(e => e.MerNo)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.MerRegTime).HasColumnType("datetime");
+
+                entity.Property(e => e.MerStandardDate).HasColumnType("datetime");
+
+                entity.Property(e => e.MerchantId).HasColumnType("int(11)");
+
+                entity.Property(e => e.NonQrCreditTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ProductName)
+                    .HasColumnType("varchar(16)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.QrCreditTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.RecordNo)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Remark)
+                    .HasColumnType("varchar(64)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SnNo)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort).HasColumnType("int(11)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                entity.Property(e => e.SubsidyProfit).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.SubsidyProfitRate).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.SubsidyType).HasColumnType("int(11)");
+
+                entity.Property(e => e.SubsidyUserId).HasColumnType("int(11)");
+
+                entity.Property(e => e.TradeMonth)
+                    .HasColumnType("varchar(6)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.UpdateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Version).HasColumnType("int(11)");
+            });
+
+            modelBuilder.Entity<ProfitSubsidyExport>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.BrandName)
+                    .HasColumnType("varchar(30)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.CreditTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.DirectFlag)
+                    .HasColumnType("varchar(10)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.KqSnNo)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.MakerCode)
+                    .HasColumnType("varchar(30)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.MerchantName)
+                    .HasColumnType("varchar(30)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.Rank).HasColumnType("int(11)");
+
+                entity.Property(e => e.RealName)
+                    .HasColumnType("varchar(30)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort).HasColumnType("int(11)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                entity.Property(e => e.SubsidyProfit).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.UserLevel).HasColumnType("int(11)");
+            });
+
             modelBuilder.Entity<PublicAccountSet>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -10403,6 +11261,152 @@ namespace MySystem.PxcModels
                     .HasCollation("utf8_general_ci");
             });
 
+            modelBuilder.Entity<SchoolMakerStudy>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.Contents)
+                    .HasColumnType("longtext")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.Detail)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ListPic)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort).HasColumnType("int(11)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                entity.Property(e => e.Title)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.Url)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+            });
+
+            modelBuilder.Entity<SchoolMorningMeet>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.Contents)
+                    .HasColumnType("longtext")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.Lecturer)
+                    .HasColumnType("varchar(30)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Photo)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort).HasColumnType("int(11)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                entity.Property(e => e.StudyPerson).HasColumnType("int(11)");
+
+                entity.Property(e => e.Title)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.Url)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+            });
+
+            modelBuilder.Entity<SchoolMorningMeetLog>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.MeetId).HasColumnType("int(11)");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort).HasColumnType("int(11)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
+            });
+
             modelBuilder.Entity<ServiceCenter>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");