From 75e4afe327894168f7d65e87b9fbf0fac4612db3 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 19 七月 2023 17:44:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-other/src/main/resources/mapper/SiteMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cloud-server-other/src/main/resources/mapper/SiteMapper.xml b/cloud-server-other/src/main/resources/mapper/SiteMapper.xml
index d9c0015..3b6aa00 100644
--- a/cloud-server-other/src/main/resources/mapper/SiteMapper.xml
+++ b/cloud-server-other/src/main/resources/mapper/SiteMapper.xml
@@ -50,7 +50,7 @@
a.payMoney as payMoney,
CONCAT(DATE_FORMAT(a.startTime, '%Y-%m-%d %H:%i'), '-', DATE_FORMAT(a.endTime, '%H:%i')) as appointment,
a.`status`,
- DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s') as insertTime
+ UNIX_TIMESTAMP(a.insertTime) * 1000 as insertTime
from t_site_booking a
left join t_site b on (a.siteId = b.id)
left join t_store c on (b.storeId = c.id)
--
Gitblit v1.7.1