Merge branch 'master' of http://git.zzliaoyuan.com:4000/wushaodong/decorate

apps/agent/serializers.py

@@ -45,12 +45,12 @@ class GeneralAgentComboboxSerializer(serializers.ModelSerializer):
 class AgentComboboxSerializer(serializers.ModelSerializer):
     class Meta:
         model = Agent
-        fields = ('id', 'name',)
+        fields = ('id', 'name', 'general_agent_id')
 
 class StoreComboboxSerializer(serializers.ModelSerializer):
     class Meta:
         model = Store
-        fields = ('id', 'name',)
+        fields = ('id', 'name', 'agent_id')
 
 class StoreSerializer(serializers.ModelSerializer):
     create_user_text = serializers.CharField(source='create_user.name', read_only=True)