zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 处理合并的bug

This commit is contained in:
caoqianming 2024-01-10 10:11:43 +08:00
parent 8e96afac4c
commit fce6d86f07
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/system/views.py
View File

@ -719,9 +719,6 @@ class SysConfigView(MyLoggingMixin, APIView):
reload = False reload = False
if request.query_params.get('reload', None): if request.query_params.get('reload', None):
reload = True reload = True
<<<<<<< HEAD
return Response(get_sysconfig(reload=reload))
=======
project_code = request.query_params.get('project_code', '') project_code = request.query_params.get('project_code', '')
if project_code: if project_code:
from apps.develop.models import Project from apps.develop.models import Project
@ -733,7 +730,6 @@ class SysConfigView(MyLoggingMixin, APIView):
else: else:
config = get_sysconfig(reload=reload) config = get_sysconfig(reload=reload)
return Response(config) return Response(config)
>>>>>>> 1eec1c2 (feat: base- 基于项目code返回或更改配置信息)
@swagger_auto_schema(request_body=Serializer) @swagger_auto_schema(request_body=Serializer)
def put(self, request, format=None): def put(self, request, format=None):