From f9c7928bff92596686e05a15fef21d499e954088 Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期一, 06 七月 2020 18:17:41 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.M071.Process/M071Models.cs | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/Bro.M071.Process/M071Models.cs b/src/Bro.M071.Process/M071Models.cs
index a5c4137..0d94bd0 100644
--- a/src/Bro.M071.Process/M071Models.cs
+++ b/src/Bro.M071.Process/M071Models.cs
@@ -205,9 +205,13 @@
{
public string Barcode;
- public List<MeasurementUint> Measurements = new List<MeasurementUint>();
+ public List<MeasurementUnit> Measurements = new List<MeasurementUnit>();
public List<IShapeElement> ElementList = new List<IShapeElement>();
+
+ public DateTime? StartTime = null;
+
+ public DateTime? EndTime = null;
public event PropertyChangedEventHandler PropertyChanged;
@@ -235,7 +239,7 @@
}
}
- public class MeasurementUint : IComplexDisplay, INotifyPropertyChanged, IDisposable
+ public class MeasurementUnit : IComplexDisplay, INotifyPropertyChanged, IDisposable
{
public string Id = Guid.NewGuid().ToString();
--
Gitblit v1.8.0