Merge remote-tracking branch 'remotes/origin/peng' into test

AdminController/DeviceManagementController.py

@@ -416,7 +416,6 @@ class DeviceManagement(View):
                 if '设备配置数据' in delDataOptions:
                     UidSetModel.objects.filter(uid__in=uidList).delete()
                 if '设备推送数据' in delDataOptions:
-                    UidPushModel.objects.filter(uid_set__uid__in=uidList).delete()
                     Equipment_Info.objects.filter(devUid__in=uidList).delete()
                 if '设备AP信息数据' in delDataOptions:
                     UidUserModel.objects.filter(UID__in=uidList).delete()