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

# Conflicts:
#	EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordD.cs
#	EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsTemD.cs
#	EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsTemH.cs

EquipMgr/Tnb.EquipMgr.Entities/Dto/MaterialListOutput.cs

@@ -7,15 +7,14 @@ using System.Threading.Tasks;
 namespace Tnb.EquipMgr.Entities.Dto
 {
     /// <summary>
-    /// 产品列表输出类
+    /// 物料列表输出类
     /// </summary>
-    public class ProductListOutput
+    public class MaterialListOutput
     {
         public string id { get; set; }
-        public string product_code { get; set; }
-        public string product_name { get; set; }
-        public string product_standard { get; set; }  
-        public string product_group { get; set; }
+        public string code { get; set; }
+        public string name { get; set; }
+        public string material_group { get; set; }
         public int real_cavity_qty { get; set; }
     }
     /// <summary>

EquipMgr/Tnb.EquipMgr.Entities/Dto/ToolMoldInput.cs

@@ -10,9 +10,9 @@ namespace Tnb.EquipMgr.Entities.Dto
     {
         public string mold { get; set; }
         public string[] equipid { get; set; }
-        public string productid { get; set; }
+        public string materialid { get; set; }
         public int real_cavity_qty { get; set; }
-        public string[] productids { get; set; }
+        public string[] materialids { get; set; }
 
         public string[] molds { get; set; }
     }