From 12200ec69e33881649974f31f270750ba6b15e1d Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期二, 14 七月 2020 18:27:31 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.M071.Model/Model/MeasurementUnitResult.cs | 21 +++++----------------
1 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/src/Bro.M071.Model/Model/MeasurementUnitResult.cs b/src/Bro.M071.Model/Model/MeasurementUnitResult.cs
index 278343f..a58ecba 100644
--- a/src/Bro.M071.Model/Model/MeasurementUnitResult.cs
+++ b/src/Bro.M071.Model/Model/MeasurementUnitResult.cs
@@ -41,6 +41,11 @@
[StringLength(64)]
public string MeasurementResult { get; set; }
+ /// <summary>
+ /// 浜у搧缂栫爜
+ /// </summary>
+ [NotMapped]
+ public string ProductionCode { get; set; }
[NotMapped]
public string ProductionBarcode { get; set; }
}
@@ -71,22 +76,6 @@
/// 妫�娴嬬粨鏋� ok ng
/// </summary>
public string MeasurementResult { get; set; }
- }
-
- public class MeasurementUnitResult_DTO : MeasurementUnitResult
- {
- //浜у搧鐩稿叧
- /// <summary>
- /// 浜у搧缂栫爜
- /// </summary>
- public string ProductionCode { get; set; }
-
- /// <summary>
- /// 浜у搧鏉＄爜
- /// </summary>
- public string ProductionBarcode { get; set; }
-
-
}
public class ProductionMeasurementUnitResultAndKeyUnitDataSet
--
Gitblit v1.8.0