t

Controller/SysMsg.py

@@ -19,15 +19,9 @@ from Model.models import SysMsgModel, FeedBackModel, UserExtendModel
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from Service.ModelService import ModelService
-<<<<<<< .mine
 from django.db.models import Q
 
 
-=======
-
-
-
->>>>>>> .theirs
 class SysMsgView(View):
     def get(self, request, *args, **kwargs):
         request.encoding = 'utf-8'