diff --git a/app/api/endpoints/merchant_product.py b/app/api/endpoints/merchant_product.py index 109d9fa..cf694b9 100644 --- a/app/api/endpoints/merchant_product.py +++ b/app/api/endpoints/merchant_product.py @@ -110,6 +110,7 @@ async def list_merchant_products( product_info = MerchantProductInfo.model_validate(product) products.append({ **product_info.model_dump(), + "merchant": MerchantInfo.model_validate(product.merchant), "delivery_type_name": "配送到家" if product.delivery_type == DeliveryType.DELIVERY else "自提", "delivery_time_type_name": "小时达" if product.delivery_time_type == DeliveryTimeType.IMMEDIATE else "社区团购", "pickup_time_format": f"{product.delivery_date.strftime('%m月%d日')} {product.pickup_time_from.strftime('%H:%M')}~{product.pickup_time_to.strftime('%H:%M')}" if product.delivery_date and product.pickup_time_from and product.pickup_time_to else None diff --git a/jobs.sqlite b/jobs.sqlite index f5c398e..f6fa611 100644 Binary files a/jobs.sqlite and b/jobs.sqlite differ