From 280c1bf9b93fb57b65d2c3f88cc4924aa9d780b4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 02 Jul 2021 10:39:56 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml b/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
index 348a35a..7e52764 100644
--- a/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
+++ b/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
@@ -13,7 +13,7 @@
,a.weight
,a.status
,a.remark
- ,date_format(a.receiving_time, '%Y-%m-%d %H:%d') receivingTime
+ ,date_format(a.receiving_time, '%Y-%m-%d %H:%i') receivingTime
,CONCAT(a.reserve_date, ' ', a.reserve_time) reserveTime
,GROUP_CONCAT(b.title) items
,c.username jhyName
--
Gitblit v1.9.1