Merge branch 'ETA_2.3.0' into debug

# Conflicts:
#	static/ErrMsgConfig.json

static/ErrMsgConfig.json

@@ -63,5 +63,6 @@
   "该分类下关联素材库不可删除": "The category associated with the material library cannot be deleted.",
   "请输入图片名称": "Please enter the image name",
   "请选择分类": "Please Select a Category",
-  "分类已存在": "The category already exists."
+  "分类已存在": "The category already exists.",
+  "指标名称已存在，请重新填写": "The metric name already exists, please re-enter."
 }