Merge remote-tracking branch 'origin/master'

# Conflicts:
#	apps/customer/views.py

apps/customer/views.py

@@ -421,7 +421,7 @@ class ReviewViewSet(CustomModelViewSet):
                 instance.check_time = timezone.now()
                 instance.save()
                 instance.customer.status = NewCustomer.ABANDONED
-                # 如果客户已下单，把工单状态改成放弃
+                # TODO 如果客户已下单，把工单状态改成放弃
                 Order.objects.filter(customer=instance.customer).update(status=Order.ABANDONED)
             NewCustomerRemind.filter(customer=instance.customer, remind_user=instance.customer.track_user).update(next_time=next_time)
         except CustomError as e: