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

# Conflicts:
#	docs/zh_CN/images/mysql_edit.png

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': '语句不能为空',