Merge remote-tracking branch 'origin/dev' into dev

EquipMgr/Tnb.EquipMgr.Entities/Dto/MaintainRuleMoldListOutput.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.EquipMgr.Entities.Dto
+{
+    /// <summary>
+    /// 保养规则关联模具列表输出参数
+    /// </summary>
+    public class MaintainRuleMoldListOutput
+    {
+        /// <summary>
+        /// 模具Id
+        /// </summary>
+        public string mold_id { get; set; }
+        /// <summary>
+        /// 模具编码
+        /// </summary>
+        public string mold_code { get; set; }
+        /// <summary>
+        /// 模具名称 
+        /// </summary>
+        public string mold_name { get; set; }
+    }
+}

EquipMgr/Tnb.EquipMgr.Entities/Entity/MoldMaintenance.cs

@@ -8,7 +8,7 @@ namespace Tnb.EquipMgr.Entities
     ///<summary>
     ///模具保养
     ///</summary>
-    [SugarTable("tool_mold_maintenance")]
+    [SugarTable("tool_mold_maintain_item")]
     public partial class MoldMaintenance
     {
         /// <summary>