From 8a286d8dd894be550bd0ce9fd859781f98478747 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 20 七月 2021 15:15:04 +0800
Subject: [PATCH] 今日开发     客户资料。前端同步到后端  ,书城端和会员端都需要同步                  绩效管理  菜单修改                  绩效管理-我的报表,没有参与的大项,小项都不显示                  绩效管理-工作报表  批量查询,批量打印

---
 zhengcaioa/Model/HrSalary.cs |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/zhengcaioa/Model/HrSalary.cs b/zhengcaioa/Model/HrSalary.cs
index b0bce30..f0fd961 100644
--- a/zhengcaioa/Model/HrSalary.cs
+++ b/zhengcaioa/Model/HrSalary.cs
@@ -49,9 +49,13 @@
     public class HrSalaryAppeal
     {
         [Key]
-        public int id { get; set; }
+        public string id { get; set; }
 
-        public string salary_id { get; set; }          
+        public string salary_id { get; set; }
+
+        public int Year { get; set; }
+
+        public int Month { get; set; }
 
         public string reason { get; set; }
 
@@ -70,5 +74,22 @@
         public string chk_result { get; set; }
 
         public string status { get; set; }
+
+        public string createrName { get; set; }
+
+        public string tittle { get; set; }
+
+        public string shenpi_status { get; set; }
+    }
+
+
+    public class HrSalaryAppealDTO: HrSalaryAppeal
+    {
+        public string Step { get; set; }
+
+        public string Tongguojujue { get; set; }
+
+        public string Content { get; set; }
+
     }
 }

--
Gitblit v1.9.1