From 9af1a01af4f912de6fb52cc79f925799f847b0f3 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 18 十一月 2022 13:35:33 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderDAO.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderDAO.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderDAO.xml
index 61ac788..310021e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderDAO.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderDAO.xml
@@ -66,7 +66,7 @@
sr.pay_time, sr.delivery_type, sr.delivery_status, sr.logistics_company,
sr.logistics_no, sr.create_at, uad.name as receiver_name, uad.phone as receiver_phone,
group_concat(og.goods_name)
- as goodsName, ss.name as store_name ,ccep.adress
+ as goodsName, ss.name as store_name ,ccep.address
FROM com_shop_flower_order sr LEFT JOIN com_shop_flower_order_goods og ON sr.id = og.order_id
LEFT JOIN com_shop_flower_goods_attr ga ON og.goods_attr_id = ga.id
LEFT JOIN sys_user su ON sr.user_id = su.user_id
--
Gitblit v1.7.1