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

# Conflicts: # docs/zh_CN/images/mysql_edit.png
2019-04-28 17:05:44 +08:00 · 2019-04-28 17:05:44 +08:00 · f4450b35a5
parent 2f73394489
commit f4450b35a5
1 changed files with 1 additions and 1 deletions
--- a/escheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/escheduler-ui/src/js/module/i18n/locale/zh_CN.js
@ -448,7 +448,7 @@ export default {
  'Max used connections': '同时使用连接最大数',
  'Threads running connections': '数据库当前活跃连接数',
  'Worker group': 'Worker分组',
-  'Please enter a positive integer greater than 0': '请输入大于 0 的正整数'
+  'Please enter a positive integer greater than 0': '请输入大于 0 的正整数',
  'Pre Statement': '前置sql',
  'Post Statement': '后置sql',
  'Statement cannot be empty': '语句不能为空',