allied-creation / allied-creation-gateway · 提交

转到一个项目

作者 yangfu
提交 5ecd28c87a10b8e959cf93371948cd815bfac38a 1 个父辈 0d64b3f5

Merge branch 'test' of http://gitlab.fjmaimaimai.com/allied-creation/allied-crea… 

…tion-gateway into test

# Conflicts:
#	pkg/port/beego/controllers/web_client/excel_data_controller.go
内嵌 并排对比
正在显示 1 个修改的文件 包含 4 行增加 和 3 行删除
@@ -286,9 +286,10 @@ func (srv ExcelDataService) FileImportTemplate(importDataCommand *command.Import @@ -286,9 +286,10 @@ func (srv ExcelDataService) FileImportTemplate(importDataCommand *command.Import
286 var mapTemplate = map[string]string{ 286 var mapTemplate = map[string]string{
287 domain.TemplateCompanyUser: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210909/object/1631171021_baB6y5zdpwC2WnsHFQhKC3dkQEaAYMNZ.xlsx", 287 domain.TemplateCompanyUser: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210909/object/1631171021_baB6y5zdpwC2WnsHFQhKC3dkQEaAYMNZ.xlsx",
288 // 模板待更新 288 // 模板待更新
289 - domain.TemplateOrganization: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210909/object/1631171021_baB6y5zdpwC2WnsHFQhKC3dkQEaAYMNZ.xlsx",  
290 - domain.TemplateCooperationUser: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210909/object/1631171021_baB6y5zdpwC2WnsHFQhKC3dkQEaAYMNZ.xlsx",  
291 - domain.TemplateDividendsOrders: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210909/object/1631171021_baB6y5zdpwC2WnsHFQhKC3dkQEaAYMNZ.xlsx", 289 + domain.TemplateOrganization: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210909/object/1631171021_baB6y5zdpwC2WnsHFQhKC3dkQEaAYMNZ.xlsx",
  290 + domain.TemplateCooperationUser: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210909/object/1631171021_baB6y5zdpwC2WnsHFQhKC3dkQEaAYMNZ.xlsx",
  291 + domain.TemplateDividendsOrders: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210909/object/1631171021_baB6y5zdpwC2WnsHFQhKC3dkQEaAYMNZ.xlsx",
  292 + domain.ImportDividendsReturnOrders: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210909/object/1631171021_baB6y5zdpwC2WnsHFQhKC3dkQEaAYMNZ.xlsx",
292 } 293 }
293 var url string 294 var url string
294 var ok bool 295 var ok bool