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

AdminController/DeviceManagementController.py

@@ -440,6 +440,7 @@ class DeviceManagement(View):
                     UIDModel.objects.filter(uid__in=uidList).update(status=0)
                     UIDCompanySerialModel.objects.filter(uid__uid__in=uidList).delete()
                     CompanySerialModel.objects.filter(serial_number__in=serial_number_list).update(status=1)
+                    UidPushModel.objects.filter(uid_set__uid__in=uidList).delete()
                     # 序列号加入重置状态redis列表
                     redis_obj = RedisObject()
                     for serial in serial_number_list: