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

src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue

@@ -138,11 +138,11 @@
               show-overflow-tooltip
               label="条款名称">
             </el-table-column>
-            <el-table-column
-              prop="productType"
-              width="100"
-              label="产品类型">
-            </el-table-column>
+<!--            <el-table-column-->
+<!--              prop="productType"-->
+<!--              width="100"-->
+<!--              label="产品类型">-->
+<!--            </el-table-column>-->
             <el-table-column
               prop="productLine"
               width="180"