From ed3015095f1b0e88bc579877c678a3fac191381f Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 28 六月 2021 14:32:26 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa
---
zhengcaioa/DTO/ProjectDTO.cs | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/zhengcaioa/DTO/ProjectDTO.cs b/zhengcaioa/DTO/ProjectDTO.cs
index e8e20b9..b2bec69 100644
--- a/zhengcaioa/DTO/ProjectDTO.cs
+++ b/zhengcaioa/DTO/ProjectDTO.cs
@@ -19,6 +19,10 @@
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,7 +51,9 @@
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; }
@@ -63,7 +69,7 @@
public List<Projectyouxiao> Projectyouxiaos { get; set; }
- public List<Projectzhongbiao> Projectzhongbiaos { get; set; }
+ public List<ProjectzhongbiaoDTO> Projectzhongbiaos { get; set; }
public string[] ZhuanjiaList { get; set; }
}
@@ -90,7 +96,17 @@
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; }
}
}
--
Gitblit v1.9.1