From cfb8794f713122f6094b34499cc24678b9b63f2b Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Thu, 27 Mar 2025 23:47:00 +0800
Subject: [PATCH] update

---
 app/api/endpoints/merchant_product.py |   1 +
 jobs.sqlite                           | Bin 24576 -> 24576 bytes
 2 files changed, 1 insertion(+)

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 f5c398ec5d15af384b162d61be669471d4f11199..f6fa6110fef9daf214b2d49c46a2613bf02fcb07 100644
GIT binary patch
delta 19
acmZoTz}Rqrae_2s<3t%}#>R~a3*rGs_Xjcn

delta 19
acmZoTz}Rqrae_2s?L--8#@dYu3*rGsy9X)&