Merge remote-tracking branch 'origin/master'

apps/account/views.py

@@ -192,7 +192,7 @@ class StoreTreeView(APIView):
                 'field':'agent',
                 'children': [],
             }
-            stores = Store.objects.filter(agent=agent, enable=True).values('id','name')
+            stores = Store.objects.filter(agent_id=agent['id'], enable=True).values('id','name')
             for store in stores:
                 manage_store = ManageStoreUser.objects.filter(manage_user_id=id, store=store).first()
                 checked = True and manage_store or False