From a93ed58ca6aa82a8fe0adeb15f3a38f873bf2754 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 30 三月 2022 15:29:47 +0800
Subject: [PATCH] 丧假带薪
---
zhengcaioa/DTO/ProjectDTO.cs | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/zhengcaioa/DTO/ProjectDTO.cs b/zhengcaioa/DTO/ProjectDTO.cs
index e8e20b9..a35fe7d 100644
--- a/zhengcaioa/DTO/ProjectDTO.cs
+++ b/zhengcaioa/DTO/ProjectDTO.cs
@@ -14,11 +14,16 @@
public string City { get; set; }
public string AreaId { get; set; }
public string Cgfs { get; set; }
+ public string CgfsName { get; set; }
public string Number { get; set; }
public string Name { get; set; }
public string Drhx { get; set; }
public string Drcunzai { get; set; }
public string DrhxPrice { get; set; }
+ public decimal? DrhxDefen { get; set; }
+ public string DrhxDefenName { get; set; }
+ public decimal? DshxDefen { get; set; }
+ public string DshxDefenName { get; set; }
public string Dshx { get; set; }
public string Dscunzai { get; set; }
public string DshxPrice { get; set; }
@@ -47,15 +52,20 @@
public string[] ZhongbiaoId { get; set; }
public string[] Names { get; set; }
public string[] Price { get; set; }
-
+ public decimal?[] Defen { get; set; }
+
+ public string NamesZhongbiao { get; set; }
public string Fblx { get; set; }
public string Fbyy { get; set; }
public string Caigourenname { get; set; }
+
+ public string Caigourennamecunzai { get; set; }
public string Caigourenaddress { get; set; }
public string Caigourencontact { get; set; }
public string Dailiname { get; set; }
+ public string Dailinamecunzai { get; set; }
public string Dailiaddress { get; set; }
public string Dailicontact { get; set; }
@@ -63,9 +73,16 @@
public List<Projectyouxiao> Projectyouxiaos { get; set; }
- public List<Projectzhongbiao> Projectzhongbiaos { get; set; }
+ public List<ProjectzhongbiaoDTO> Projectzhongbiaos { get; set; }
public string[] ZhuanjiaList { get; set; }
+
+ public decimal? Fencha { get; set; }
+ public int? Shuliang { get; set; }
+
+ public decimal? Caigouyusuan { get; set; }
+
+ public string CaigouyusuanName { get; set; }
}
public class ProjectDTOSearch : SearchEntity
@@ -73,6 +90,11 @@
public string StartTimestar { get; set; }
public string StartTimeend { get; set; }
+
+ public string KaibiaoTimeStar { get; set; }
+
+ public string KaibiaoTimeEnd { get; set; }
+
public string Sheng { get; set; }
public string City { get; set; }
public string AreaId { get; set; }
@@ -90,7 +112,29 @@
public string Creater { get; set; }
public string Names { get; set; }
-
+
+ public string NamesToubiao { get; set; }
+
+
+ public string fblx { get; set; }
+
+ public string Reasonname { get; set; }
+
+ public string ShiFouyReasonname { get; set; }
+
+ public string Fencha { get; set; }
+
+ public string Caigourenname { get; set; }
+
+ public string Dailiname { get; set; }
+
+ public string Shuliang { get; set; }
+
+ public string Fenchadayu { get; set; }
+
+ public string Baojiachaxiaoyu { get; set; }
+
+ public string Chuanbiaofenxi { get; set; }
}
}
--
Gitblit v1.9.1