Merge branch 'hotfix/mix_table_calculate' into debug

controllers/data_manage/excel/excel_info.go

@@ -1787,8 +1787,8 @@ func (c *ExcelInfoController) Calculate() {
 	}
 	//nanCheck := fmt.Sprintf("%0.f", calVal)
 	// 转Decimal然后四舍五入
-	calVal, _ := decimal.NewFromFloat(calFloat).Round(4).Float64()
-
+	calFloat, _ = decimal.NewFromFloat(calFloat).Round(4).Float64()
+	calVal := utils.FormatTableDataShowValue(calFloat)
 	//calVal := calResult.String()
 	//if err != nil {
 	//	br.Msg = "计算失败"