Merge branch 'ETA_2.3.2' into debug

# Conflicts:
#	static/ErrMsgConfig.json

controllers/data_manage/clarksons_data.go

@@ -169,7 +169,7 @@ func (this *ClarksonsDataController) EditClassify() {
 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
 		return
 	}
-	if req.BaseFromClassifyId <= 0 {
+	if req.BaseFromClassifyId < 0 {
 		br.Msg = "参数错误"
 		return
 	}
@@ -1518,7 +1518,6 @@ func (this *ClarksonsDataController) ClarksonsData() {
 		pars = append(pars, "%"+keyword+"%")
 	}
 
-
 	sci99List, err := data_manage.GetClarksonsIndex(condition, pars)
 	if err != nil {
 		br.Msg = "获取数据失败"
@@ -1648,4 +1647,4 @@ func (this *ClarksonsDataController) IndexPageList() {
 	br.Success = true
 	br.Msg = "获取成功"
 	br.Data = resp
-}
+}

static/ErrMsgConfig.json

@@ -62,4 +62,5 @@
   "原指标与替换指标存在引用关系，不允许替换": "Original indicators and replacement indicators have a referencing relationship, which is not allowed to be replaced.",
   "该分类下关联素材库不可删除": "The category associated with the material library cannot be deleted.",
   "请输入图片名称": "Please enter the image name"
+  "请选择分类": "Please Select a Category"
 }