Browse Source

Merge branch 'hotfix/mix_table_calculate' into debug

xyxie 5 months ago
parent
commit
f474054f64
1 changed files with 1 additions and 1 deletions
  1. 1 1
      controllers/data_manage/excel/excel_info.go

+ 1 - 1
controllers/data_manage/excel/excel_info.go

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