From 16edbbe772e24eb71f6519558576d513e3cf2746 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周三, 24 9月 2025 15:31:07 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/DF22001YiQi
---
iWara.SCADA.Code/iWare.Wms.Core/Entity/SCADA/Equipmentbaseinfo.cs | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/iWara.SCADA.Code/iWare.Wms.Core/Entity/SCADA/Equipmentbaseinfo.cs b/iWara.SCADA.Code/iWare.Wms.Core/Entity/SCADA/Equipmentbaseinfo.cs
index 0b1021b..3ff5032 100644
--- a/iWara.SCADA.Code/iWare.Wms.Core/Entity/SCADA/Equipmentbaseinfo.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Core/Entity/SCADA/Equipmentbaseinfo.cs
@@ -73,6 +73,12 @@
public string EquipmentManufacturer { get; set; }
/// <summary>
+ /// 娓呮礂娑叉坊鍔犳椂闂� 銆怑ditby shaocx,2024-06-11銆�
+ /// </summary>
+ [Comment("娓呮礂娑叉坊鍔犳椂闂�")]
+ public DateTime? DetergentAddtime { get; set; }
+
+ /// <summary>
/// 娓呮礂娑叉洿鎹㈡椂闂�
/// </summary>
[Comment("娓呮礂娑叉洿鎹㈡椂闂�")]
@@ -103,6 +109,12 @@
public int KnifeToolChangeAlertThreshold { get; set; }
/// <summary>
+ /// 鍒囧墛娑叉坊鍔犳椂闂� 銆怑ditby shaocx,2024-06-11銆�
+ /// </summary>
+ [Comment("鍒囧墛娑叉坊鍔犳椂闂�")]
+ public DateTime? CuttingFluidAddTime { get; set; }
+
+ /// <summary>
/// 鍒囧墛娑叉洿鎹㈡椂闂�
/// </summary>
[Comment("鍒囧墛娑叉洿鎹㈡椂闂�")]
--
Gitblit v1.9.3