From 274fb67703d0ffcc7e3398d41855c5c8bfb3383b Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 25 六月 2021 13:07:44 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa
---
zhengcaioa/Model/zhengcaioaContext.cs | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/zhengcaioa/Model/zhengcaioaContext.cs b/zhengcaioa/Model/zhengcaioaContext.cs
index 09d641c..d12c6ec 100644
--- a/zhengcaioa/Model/zhengcaioaContext.cs
+++ b/zhengcaioa/Model/zhengcaioaContext.cs
@@ -21,6 +21,7 @@
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<AdmAskLeave> AdmAskLeaves { get; set; }
public virtual DbSet<AdmAskLeaveOff> AdmAskLeaveOffs { get; set; }
@@ -341,10 +342,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 +352,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 +394,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 =>
--
Gitblit v1.9.1