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

AdminController/ServeManagementController.py

@@ -385,6 +385,9 @@ class serveManagement(View):
 
                 # 查询product_id
                 product_id = ''
+                subscription_group = ''
+                subscription_group_id = ''
+                package_type = 0
                 in_app_purchase_qs = InAppPurchasePackage.objects.filter(rank__id=store_meal_id).\
                     values('product_id', 'subscription_group', 'subscription_group_id', 'package_type')
                 if in_app_purchase_qs.exists():