From adfe53d56273a21dccfc20401c1c1059d5ce5beb Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期二, 08 六月 2021 15:08:50 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa
---
zhengcaioa/Model/zhengcaioaContext.cs | 29 ++++++++---------------------
1 files changed, 8 insertions(+), 21 deletions(-)
diff --git a/zhengcaioa/Model/zhengcaioaContext.cs b/zhengcaioa/Model/zhengcaioaContext.cs
index c65c3f7..5bd4626 100644
--- a/zhengcaioa/Model/zhengcaioaContext.cs
+++ b/zhengcaioa/Model/zhengcaioaContext.cs
@@ -210,9 +210,9 @@
modelBuilder.Entity<AdmAttendanceRule>(entity =>
{
- entity.HasNoKey();
-
entity.ToTable("ADM_AttendanceRules");
+
+ entity.Property(e => e.Id).HasMaxLength(50);
entity.Property(e => e.Absenteeism)
.HasColumnType("decimal(18, 2)")
@@ -247,10 +247,6 @@
.IsRequired()
.HasMaxLength(50)
.HasColumnName("holiday");
-
- entity.Property(e => e.Id)
- .IsRequired()
- .HasMaxLength(50);
entity.Property(e => e.LatePayment1)
.HasColumnType("decimal(18, 2)")
@@ -340,21 +336,19 @@
entity.Property(e => e.Weekend1).HasColumnName("weekend");
entity.Property(e => e.WorkingEnd)
- .IsRequired()
.HasMaxLength(50)
.HasColumnName("working_end");
entity.Property(e => e.WorkingStart)
- .IsRequired()
.HasMaxLength(50)
.HasColumnName("working_start");
});
modelBuilder.Entity<AdmAttendanceRulesDtl>(entity =>
{
- entity.HasNoKey();
-
entity.ToTable("ADM_AttendanceRules_dtl");
+
+ entity.Property(e => e.Id).HasMaxLength(50);
entity.Property(e => e.Creater)
.IsRequired()
@@ -366,10 +360,6 @@
.HasColumnType("datetime")
.HasColumnName("createtime")
.HasDefaultValueSql("(getdate())");
-
- entity.Property(e => e.Id)
- .IsRequired()
- .HasMaxLength(50);
entity.Property(e => e.Modifier)
.IsRequired()
@@ -385,7 +375,6 @@
entity.Property(e => e.Name).HasMaxLength(200);
entity.Property(e => e.Pid)
- .IsRequired()
.HasMaxLength(50)
.HasColumnName("pid");
@@ -396,14 +385,12 @@
.HasDefaultValueSql("('A')");
entity.Property(e => e.ValueEnd)
- .HasColumnType("date")
- .HasColumnName("value_end")
- .HasDefaultValueSql("(getdate())");
+ .HasMaxLength(50)
+ .HasColumnName("value_end");
entity.Property(e => e.ValueStart)
- .HasColumnType("date")
- .HasColumnName("value_start")
- .HasDefaultValueSql("(getdate())");
+ .HasMaxLength(50)
+ .HasColumnName("value_start");
});
modelBuilder.Entity<AdmBreakPrecedent>(entity =>
--
Gitblit v1.9.1