From d4a6d65f5e449c3e5464aa18ae97bf8953987217 Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期二, 10 八月 2021 15:44:14 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa
---
zhengcaioa/Model/HrSalary.cs | 21 ++++-----------------
1 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/zhengcaioa/Model/HrSalary.cs b/zhengcaioa/Model/HrSalary.cs
index f0fd961..2458ff1 100644
--- a/zhengcaioa/Model/HrSalary.cs
+++ b/zhengcaioa/Model/HrSalary.cs
@@ -53,11 +53,11 @@
public string salary_id { get; set; }
- public int Year { get; set; }
-
- public int Month { get; set; }
-
public string reason { get; set; }
+
+ public int year { get; set; }
+
+ public int month { get; set; }
public decimal amount { get; set; }
@@ -76,20 +76,7 @@
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