瀏覽代碼

Merge branch 'feature/eta2.2.6_material' into debug

# Conflicts:
#	controllers/data_manage/excel/balance_table.go
#	models/data_manage/excel/excel_info.go
#	services/document_manage_service/document_manage_service.go
xyxie 4 月之前
父節點
當前提交
7b1a3cb98c

+ 1 - 0
controllers/data_manage/excel/balance_table.go

@@ -387,6 +387,7 @@ func (c *ExcelInfoController) GetBalanceChartList() {
 		br.Ret = 408
 		return
 	}
+
 	excelInfoId, _ := c.GetInt("ExcelInfoId")
 	if excelInfoId <= 0 {
 		br.Msg = "请选择平衡表"

+ 1 - 1
services/document_manage_service/document_manage_service.go

@@ -496,7 +496,7 @@ func RuiSiReportListV2(classifyIdList, chartPermissionIdList []string, keyword,
 			classifyIdThird = append(classifyIdThird, strconv.Itoa(v.Id))
 		}
 	}
-	// 作者为 战研中心 PCIR
+	// 作者为 全球市场中心 PCI Research
 	author := "战研中心 PCIR"
 	// 已发布的报告
 	state := 2