From 76430b83e28b43122886c1cd8a9fb1cd61040d22 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 28 六月 2021 12:50:50 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa
---
zhengcaioa/Model/zhengcaioaContext.cs | 144 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 138 insertions(+), 6 deletions(-)
diff --git a/zhengcaioa/Model/zhengcaioaContext.cs b/zhengcaioa/Model/zhengcaioaContext.cs
index 09d641c..1dab811 100644
--- a/zhengcaioa/Model/zhengcaioaContext.cs
+++ b/zhengcaioa/Model/zhengcaioaContext.cs
@@ -21,6 +21,9 @@
public virtual DbSet<SimBindView> SimBindView { get; set; }
public virtual DbSet<SimCost> SimCost { get; set; }
public virtual DbSet<SimCostView> SimCostView { get; set; }
+ public virtual DbSet<HrSalaryAppeal> HrSalaryAppeal { get; set; }
+ public virtual DbSet<SimCostYearView> SimCostYearView { get; set; }
+
public virtual DbSet<AdmAskLeave> AdmAskLeaves { get; set; }
public virtual DbSet<AdmAskLeaveOff> AdmAskLeaveOffs { get; set; }
@@ -43,6 +46,7 @@
public virtual DbSet<CooperOrder> CooperOrders { get; set; }
public virtual DbSet<CooperVisit> CooperVisits { get; set; }
public virtual DbSet<CooperatecustomCustomer> CooperatecustomCustomers { get; set; }
+ public virtual DbSet<CusFangwenjilu> CusFangwenjilus { get; set; }
public virtual DbSet<FiAccount> FiAccounts { get; set; }
public virtual DbSet<FiAccountRecord> FiAccountRecords { get; set; }
public virtual DbSet<FiOrderrecievemoney> FiOrderrecievemoneys { get; set; }
@@ -64,6 +68,7 @@
public virtual DbSet<IntentionOrder> IntentionOrders { get; set; }
public virtual DbSet<IntentionVisit> IntentionVisits { get; set; }
public virtual DbSet<Liaotian> Liaotians { get; set; }
+ public virtual DbSet<LZhuanjiahuidum> LZhuanjiahuida { get; set; }
public virtual DbSet<Oayouhui> Oayouhuis { get; set; }
public virtual DbSet<PltAuth> PltAuths { get; set; }
public virtual DbSet<PltPage> PltPages { get; set; }
@@ -341,10 +346,6 @@
.HasMaxLength(50)
.HasColumnName("attendance_id");
- entity.Property(e => e.Chidaofenzhong)
- .HasColumnType("decimal(18, 4)")
- .HasColumnName("chidaofenzhong");
-
entity.Property(e => e.Creater)
.IsRequired()
.HasMaxLength(50)
@@ -355,6 +356,10 @@
.HasColumnType("datetime")
.HasColumnName("createtime")
.HasDefaultValueSql("(getdate())");
+
+ entity.Property(e => e.Iswork)
+ .HasMaxLength(1)
+ .HasColumnName("iswork");
entity.Property(e => e.Kuanggongtianshu)
.HasColumnType("decimal(18, 4)")
@@ -393,13 +398,25 @@
.HasColumnType("datetime")
.HasDefaultValueSql("(getdate())");
+ entity.Property(e => e.Shangwuchidaofenzhong)
+ .HasColumnType("decimal(18, 4)")
+ .HasColumnName("shangwuchidaofenzhong");
+
+ entity.Property(e => e.Shangwuzaotuifenzhong)
+ .HasColumnType("decimal(18, 4)")
+ .HasColumnName("shangwuzaotuifenzhong");
+
entity.Property(e => e.Xiaojia)
.HasColumnType("decimal(18, 4)")
.HasColumnName("xiaojia");
- entity.Property(e => e.Zaotuifenzhong)
+ entity.Property(e => e.Xiawuchidaofenzhong)
.HasColumnType("decimal(18, 4)")
- .HasColumnName("zaotuifenzhong");
+ .HasColumnName("xiawuchidaofenzhong");
+
+ entity.Property(e => e.Xiawuzaotuifenzhong)
+ .HasColumnType("decimal(18, 4)")
+ .HasColumnName("xiawuzaotuifenzhong");
});
modelBuilder.Entity<AdmAttendanceRule>(entity =>
@@ -1711,6 +1728,53 @@
.HasMaxLength(50)
.HasColumnName("ywjl")
.HasComment("涓氬姟缁忕悊");
+ });
+
+ modelBuilder.Entity<CusFangwenjilu>(entity =>
+ {
+ entity.ToTable("cus_fangwenjilu");
+
+ entity.Property(e => e.Id).HasMaxLength(50);
+
+ entity.Property(e => e.Creater)
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnName("creater")
+ .HasDefaultValueSql("('1')");
+
+ entity.Property(e => e.Createtime)
+ .HasColumnType("datetime")
+ .HasColumnName("createtime")
+ .HasDefaultValueSql("(getdate())");
+
+ entity.Property(e => e.Fasongfangshi)
+ .HasMaxLength(50)
+ .HasColumnName("fasongfangshi");
+
+ entity.Property(e => e.Fasongneirong)
+ .HasMaxLength(4000)
+ .HasColumnName("fasongneirong");
+
+ entity.Property(e => e.Jieshouren)
+ .HasMaxLength(2000)
+ .HasColumnName("jieshouren");
+
+ entity.Property(e => e.Modifier)
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnName("modifier")
+ .HasDefaultValueSql("('1')");
+
+ entity.Property(e => e.Modifytime)
+ .HasColumnType("datetime")
+ .HasColumnName("modifytime")
+ .HasDefaultValueSql("(getdate())");
+
+ entity.Property(e => e.RecStatus)
+ .IsRequired()
+ .HasMaxLength(1)
+ .HasColumnName("rec_status")
+ .HasDefaultValueSql("('A')");
});
modelBuilder.Entity<FiAccount>(entity =>
@@ -3207,6 +3271,63 @@
.HasColumnName("shiyongfatiao");
});
+ modelBuilder.Entity<LZhuanjiahuidum>(entity =>
+ {
+ entity.ToTable("l_zhuanjiahuida");
+
+ entity.Property(e => e.Id).HasMaxLength(50);
+
+ entity.Property(e => e.Anwser)
+ .HasMaxLength(4000)
+ .HasColumnName("anwser");
+
+ entity.Property(e => e.Creater)
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnName("creater")
+ .HasDefaultValueSql("('1')");
+
+ entity.Property(e => e.Createtime)
+ .HasColumnType("datetime")
+ .HasColumnName("createtime")
+ .HasDefaultValueSql("(getdate())");
+
+ entity.Property(e => e.Modifier)
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnName("modifier")
+ .HasDefaultValueSql("('1')");
+
+ entity.Property(e => e.Modifytime)
+ .HasColumnType("datetime")
+ .HasColumnName("modifytime")
+ .HasDefaultValueSql("(getdate())");
+
+ entity.Property(e => e.Question)
+ .HasMaxLength(500)
+ .HasColumnName("question");
+
+ entity.Property(e => e.RecStatus)
+ .IsRequired()
+ .HasMaxLength(1)
+ .HasColumnName("rec_status")
+ .HasDefaultValueSql("('A')");
+
+ entity.Property(e => e.HuidaStatus)
+ .IsRequired()
+ .HasMaxLength(1)
+ .HasColumnName("huida_status")
+ .HasDefaultValueSql("('D')");
+
+ entity.Property(e => e.Userid)
+ .HasMaxLength(50)
+ .HasColumnName("userid");
+
+ entity.Property(e => e.Username)
+ .HasMaxLength(100)
+ .HasColumnName("username");
+ });
+
modelBuilder.Entity<Oayouhui>(entity =>
{
entity.ToTable("Oayouhui");
@@ -3946,6 +4067,14 @@
.HasMaxLength(500)
.HasColumnName("drhx_price");
+ entity.Property(e => e.DrhxDefen)
+ .HasColumnType("money")
+ .HasColumnName("drhx_defen");
+
+ entity.Property(e => e.DshxDefen)
+ .HasColumnType("money")
+ .HasColumnName("dshx_defen");
+
entity.Property(e => e.Dshx)
.HasMaxLength(500)
.HasColumnName("dshx");
@@ -4089,6 +4218,9 @@
entity.Property(e => e.ProjectId)
.IsRequired()
.HasMaxLength(50);
+
+ entity.Property(e => e.Defen).HasColumnType("money")
+ .HasColumnName("defen"); ;
});
modelBuilder.Entity<SysAttachment>(entity =>
--
Gitblit v1.9.1