合并冲突

controllers/sys_role.go

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