!7 同步dev分支pr

Merge pull request !7 from xingyu/master_old

src/components/Table/src/hooks/useRender.ts

@@ -100,7 +100,7 @@ export const useRender = {
    */
   renderDict: (text, type, dictType?) => {
     if (type) {
-      return h(DictTag, { type: type, value: text, dictType: dictType || 'number' })
+      return h(DictTag, { type: type, value: text, dictType: dictType })
     }
     return ''
   },

src/views/system/sms/template/smsTemplate.data.ts

@@ -19,7 +19,7 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '短信类型',
-    dataIndex: 'status',
+    dataIndex: 'type',
     width: 180,
     customRender: ({ text }) => {
       return useRender.renderDict(text, DICT_TYPE.SYSTEM_SMS_TEMPLATE_TYPE)