Merge remote-tracking branch 'origin/master'

cuilei

23 小时以前 b6b2c379bd92f076acd16801b1442604ea21fc5d

 src/views/dnc/base/modules/ProductStructure/GuideCardBatch/KnifeListPrintModal.vue

@@ -45,7 +45,7 @@
          <th colspan="2">刀具编号</th>
          <th>刀具名称</th>
          <th colspan="2">刀具简称</th>
          <th colspan="2">刀具规格</th>
          <th colspan="2">刀具标记</th>
          <th>刀位</th>
          <th>刀具数量</th>
          <th colspan="2">描述</th>