From 1cf11872afc2a86eec4deb1366949d8aaca64bf1 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 28 Jun 2021 20:53:14 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
index ea80d88..f129dc7 100644
--- a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
@@ -47,7 +47,7 @@
SELECT
a.id id,
a.order_no orderNo,
- b.nick_name name,
+ b.nick_name nickName,
b.mobile_phone mobilePhone,
a.area area,
a.address address,
@@ -58,7 +58,7 @@
d.mobile mobile,
date_format(a.receiving_time,'%Y-%m-%d %H:%i:%S') receivingTime,
a.remark remark,
- 'a. COMMENT' comments,
+ a. COMMENT comments,
a.score score,
a.is_anonymous isAnonymous
FROM
--
Gitblit v1.9.1