fix bug

Html/src/view/fms/associate/assemblyInfo.vue

@@ -139,7 +139,7 @@
                     <div>正在上传...</div>
                 </Spin>
                 <div class="filter">
-                    <label>父工装类别：</label>
+                    <label>父工装类型：</label>
                     <Cascader
                         class="searchSelect"
                         :data="typeTree"
@@ -172,7 +172,7 @@
 
                 <div style="padding-left: 50px">
                     <div class="filter">
-                        <label>子工装类别：</label>
+                        <label>子工装类型：</label>
                         <Cascader
                             class="searchSelect"
                             :data="typeTree"

Server/Common/Siger.Middlelayer.Utility/ImportEntities/FixtureTools.cs

@@ -79,6 +79,9 @@ namespace Siger.Middlelayer.Utility.ImportEntities
 
     public class FixtureToolsProductTemplate : ImportBase
     {
+        [ExcelColumn("工装类型")]
+        public string Categroy { get; set; }
+
         [ExcelColumn("*工装名称")]
         public string FixtureTool { get; set; }
 
@@ -121,9 +124,15 @@ namespace Siger.Middlelayer.Utility.ImportEntities
 
     public class FixtureToolsAssmeblyTemplate : ImportBase
     {
+        [ExcelColumn("父工装类型")]
+        public string ParentCategory { get; set; }
+
         [ExcelColumn("*父工装名称")]
         public string ParentFixtureTool { get; set; }
 
+        [ExcelColumn("子工装类型")]
+        public string Category { get; set; }
+
         [ExcelColumn("*子工装名称")]
         public string FixtureTool { get; set; }