From 3262eb334953a1b208aa4a50584442a3804912d9 Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期日, 27 六月 2021 13:09:43 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa
---
zhengcaioa/Model/zhengcaioaContext.cs | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/zhengcaioa/Model/zhengcaioaContext.cs b/zhengcaioa/Model/zhengcaioaContext.cs
index db0fbbe..d12c6ec 100644
--- a/zhengcaioa/Model/zhengcaioaContext.cs
+++ b/zhengcaioa/Model/zhengcaioaContext.cs
@@ -342,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)
@@ -356,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)")
@@ -394,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