合并冲突

controllers/sys_role.go

@@ -729,8 +729,8 @@ func (this *SysRoleController) SystemConfig() {
         ConfKey: "KnowledgeBaseName",
     	ConfVal: conf["KnowledgeBaseName"],
     },  system.BusinessConf{
-			ConfKey: "BackendGenerate",
-			ConfVal: conf["BackendGenerate"],
+			ConfKey: "NotBackendGenerate",
+			ConfVal: conf["NotBackendGenerate"],
 		})
 
 	osc := system.BusinessConf{