Merge remote-tracking branch 'origin/master'

cuikaidong

6 天以前 1c1000a93a88b5af5eabbf410aa264b0911dbee4

 src/views/tms/requirement/ToolSharpeningList .vue

@@ -131,12 +131,11 @@
          align:"center",
          dataIndex: 'toolId'
        },
        {
          title:'刀具名称',
          align:"center",
          dataIndex: 'typeName'
        },

        // {
        //   title:'刀具名称',
        //   align:"center",
        //   dataIndex: 'typeName'
        // },
        {
          title:'厂家',
          align:"center",