Merge branch 'aj_fix_bug' into debug

models/base_from_calculate.go

@@ -713,8 +713,8 @@ func DeleteCalculateData(edbInfoId int) (err error) {
 // CheckFormula2 校验公式是否正常（比如说除法的分母不能为0之类的，实际上就是用预设的字段数据做一次计算）
 func CheckFormula2(edbInfoArr []*EdbInfo, formulaMap map[string]string, formulaStr string, edbInfoIdBytes []string) (ok bool, err error) {
 	valArr := make(map[int]float64)
-	for _, v := range edbInfoArr {
-		valArr[v.EdbInfoId] = 100
+	for k, v := range edbInfoArr {
+		valArr[v.EdbInfoId] = 100 + float64(k)
 	}
 
 	formulaStr = strings.ToUpper(formulaStr)