Merge branch 'bzq1/excel_size' of eta_server/eta_api into debug

models/data_manage/excel/request/excel_info.go

@@ -196,6 +196,8 @@ type ManualDataTemp struct {
 	ShowValue           string            `description:"展示值"`
 	Value               string            `description:"实际值（计算公式）"`
 	Decimal             *int              `description:"小数位数"`
+	Width               int               `description:"单元格宽度"`
+	Height              int               `description:"单元格高度"`
 	RelationEdbInfoList []RelationEdbInfo `description:"关联指标（计算公式中关联的指标，用于计算的时候去匹配）"`
 }
 
@@ -215,6 +217,8 @@ func (m *ManualDataReq) UnmarshalJSON(data []byte) error {
 	m.DataTimeType = alias.DataTimeType
 	m.ShowValue = alias.ShowValue
 	m.Value = alias.Value
+	m.Width = alias.Width
+	m.Height = alias.Height
 	m.RelationEdbInfoList = alias.RelationEdbInfoList
 	return nil
 }