Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue

@@ -37,7 +37,7 @@
         </div>
         <div v-if="sqlType==0" style="display: inline-block;padding-left: 10px;margin-top: 2px;">
           <x-checkbox-group v-model="showType">
-            <x-checkbox :label="'TABLE'" :disabled="isDetails">{{$t('Table')}}</x-checkbox>
+            <x-checkbox :label="'TABLE'" :disabled="isDetails">{{$t('TableMode')}}</x-checkbox>
             <x-checkbox :label="'ATTACHMENT'" :disabled="isDetails">{{$t('Attachment')}}</x-checkbox>
           </x-checkbox-group>
         </div>

dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js

@@ -115,6 +115,7 @@ export default {
   'Title': 'Title',
   'Please enter the title of email': 'Please enter the title of email',
   'Table': 'Table',
+  'TableMode': 'Table',
   'Attachment': 'Attachment',
   'SQL Parameter': 'SQL Parameter',
   'SQL Statement': 'SQL Statement',
@@ -538,7 +539,6 @@ export default {
   'Whether directory': 'Whether directory',
   'Yes': 'Yes',
   'No': 'No',
-  'Modify User': 'Modify User',
   'Please enter Mysql Database(required)': 'Please enter Mysql Database(required)',
   'Please enter Mysql Table(required)': 'Please enter Mysql Table(required)',
   'Please enter Columns (Comma separated)': 'Please enter Columns (Comma separated)',

dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js

@@ -116,6 +116,7 @@ export default {
   'Title': '主题',
   'Please enter the title of email': '请输入邮件主题',
   'Table': '表名',
+  'TableMode': '表格',
   'Attachment': '附件',
   'SQL Parameter': 'sql参数',
   'SQL Statement': 'sql语句',
@@ -538,7 +539,6 @@ export default {
   'Whether directory' : '是否文件夹',
   'Yes': '是',
   'No': '否',
-  'Modify User': '修改用户',
   'Please enter Mysql Database(required)': '请输入Mysql数据库(必填)',
   'Please enter Mysql Table(required)': '请输入Mysql表名(必填)',
   'Please enter Columns (Comma separated)': '请输入列名，用 , 隔开',