Merge branch 'dev'

Controller/MealManage.py

@@ -142,6 +142,7 @@ class MealManage(View):
                        , "commodity_type", "commodity_code", "virtual_price", "is_discounts", "discount_price"
                        , "bucket_id", "bucket__bucket", "bucket__area", "bucket__storeDay", "bucket__mold")
         res = {}
+        items_list = []
         if qs.exists():
             ql = list(qs)
             from operator import itemgetter