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

合并冲突

This commit is contained in:
caoqianming 2023-01-02 23:22:01 +08:00
parent 4d96f2d77a cf0ac02660
commit 2e67bcd48b
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/third/dahua.py
View File

@ -6,9 +6,9 @@ import traceback
import uuid import uuid
import requests import requests
from requests.exceptions import RequestException
from django.conf import settings from django.conf import settings
from rest_framework.exceptions import APIException, ParseError from rest_framework.exceptions import APIException, ParseError
from requests.exceptions import RequestException
from apps.third.errors import DH_REQUEST_ERROR from apps.third.errors import DH_REQUEST_ERROR
from apps.third.models import Tlog from apps.third.models import Tlog

2
apps/third/speaker.py
View File

@ -5,9 +5,9 @@ import uuid
import logging import logging
import requests import requests
from requests.exceptions import RequestException
from rest_framework.exceptions import APIException, ParseError from rest_framework.exceptions import APIException, ParseError
from django.conf import settings from django.conf import settings
from requests.exceptions import RequestException
from apps.third.errors import SP_REQUEST_ERROR from apps.third.errors import SP_REQUEST_ERROR
from apps.third.models import Tlog from apps.third.models import Tlog

2
apps/third/xunxi.py
View File

@ -4,9 +4,9 @@ from threading import Thread
import traceback import traceback
import uuid import uuid
import requests import requests
from requests.exceptions import RequestException
from django.conf import settings from django.conf import settings
from rest_framework.exceptions import APIException, ParseError from rest_framework.exceptions import APIException, ParseError
from requests.exceptions import RequestException
from apps.third.errors import XX_REQUEST_ERROR from apps.third.errors import XX_REQUEST_ERROR
from apps.third.models import Tlog from apps.third.models import Tlog