合并冲突

controllers/sys_role.go

@@ -747,6 +747,9 @@ func (this *SysRoleController) SystemConfig() {
 	}, system.BusinessConf{
 		ConfKey: models.KnowledgeBaseName,
 		ConfVal: conf[models.KnowledgeBaseName],
+	}, system.BusinessConf{
+		ConfKey: "BackendGenerate",
+		ConfVal: conf["BackendGenerate"],
 	})
 
 	osc := system.BusinessConf{