Merge remote-tracking branch 'yudao/dev' into dev

# Conflicts:
#	src/config/axios/service.ts
#	src/types/auto-components.d.ts

src/locales/zh-CN.ts

@@ -303,8 +303,7 @@ export default {
     typeCreate: '字典类型新增',
     typeUpdate: '字典类型编辑',
     dataCreate: '字典数据新增',
-    dataUpdate: '字典数据编辑',
-    fileUpload: '上传文件'
+    dataUpdate: '字典数据编辑'
   },
   dialog: {
     dialog: '弹窗',