Merge remote-tracking branch 'origin/master' into debug

models/base_from_calculate.go

@@ -460,6 +460,10 @@ func refreshAllCalculate(to orm.TxOrmer, edbInfoIdArr []*EdbInfo, edbInfoId, sou
 			fmt.Println(err)
 			return err
 		}
+		// 如果计算结果是NAN，那么就退出当前循环
+		if calResult.IsNan() {
+			continue
+		}
 		calVal, err := calResult.Float64()
 		if err != nil {
 			err = errors.New("计算失败：获取计算值失败 Err:" + err.Error() + ";formulaStr:" + formulaFormStr)