合并冲突

controllers/sys_role.go

@@ -724,7 +724,6 @@ func (this *SysRoleController) SystemConfig() {
 	}, system.BusinessConf{
 		ConfKey: "LoginUrl",
 		ConfVal: conf["LoginUrl"],
-
 	},
         system.BusinessConf{
         ConfKey: "KnowledgeBaseName",
@@ -732,14 +731,12 @@ func (this *SysRoleController) SystemConfig() {
     },  system.BusinessConf{
 			ConfKey: "NotBackendGenerate",
 			ConfVal: conf["NotBackendGenerate"],
-		})
 
 	}, system.BusinessConf{
 		ConfKey: models.KnowledgeBaseName,
 		ConfVal: conf[models.KnowledgeBaseName],
 	})
 
-
 	osc := system.BusinessConf{
 		ConfKey: "ObjectStorageClient",
 		ConfVal: utils.ObjectStorageClient,