Merge branch 'bzq/pool_258' of eta_server/eta_chart_lib into debug

services/excel/lucky_sheet.go

@@ -1217,6 +1217,10 @@ func GetTableDataByMixedTableData(config [][]request.MixedTableCellDataReq, hide
 					Monitor:   cell.ShowValue,
 					MergeCell: LuckySheetDataConfigMerge{},
 				}
+				if cell.DataType != request.CustomTextDT && tmp.Monitor == `` {
+					tmp.Monitor = "-"
+					cell.ShowFormatValue = "-"
+				}
 				// 前端需要隐藏被合并的单元格, 混合表格/平衡表通过这个字段判断, 不通过HandleTableCell方法隐藏
 				if cell.MerData != nil {
 					if hideMerged && cell.MerData.Type == "merged" {