Merge branch 'feature/eta1.8.5_excel_balance' into debug

controllers/data_manage/excel/excel_info.go

@@ -249,7 +249,7 @@ func (c *ExcelInfoController) Add() {
 			})
 		}
 	}
-	childExcel := new(excel3.ExcelInfo)
+	var childExcel *excel3.ExcelInfo
 	if excelInfo.Source == utils.BALANCE_TABLE && req.ParentId == 0 && excelInfo.BalanceType == 0 { //首次创建平衡表时需要添加一个默认的子表
 		timestamp = strconv.FormatInt(time.Now().UnixNano(), 10) + "_" + utils.GetRandString(10)
 		childExcel = &excel3.ExcelInfo{

services/data/excel/excel_op.go

@@ -172,7 +172,7 @@ func Copy(oldExcelInfoId, excelClassifyId int, excelName string, sysUser *system
 			v.ExcelInfoId = 0
 			list[k] = v
 		}
-		childExcel := new(excelModel.ExcelInfo)
+		var childExcel *excelModel.ExcelInfo
 		err = excelModel.AddExcelInfo(excelInfo, list, childExcel)
 		if err != nil {
 			errMsg = "保存失败"