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/DTO/ProjectDTO.cs | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/DTO/ProjectDTO.cs b/zhengcaioa/DTO/ProjectDTO.cs
index ca5a709..7116042 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,16 +51,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; }
@@ -64,9 +72,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
@@ -101,5 +116,19 @@
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; }
+
+
+
}
}
--
Gitblit v1.9.1