From 1f9d05fd255fbd21356dad37527c7d33fda4fb8b Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期五, 04 八月 2023 17:03:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-competition/src/main/resources/mapper/CompetitionMapper.xml | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/cloud-server-competition/src/main/resources/mapper/CompetitionMapper.xml b/cloud-server-competition/src/main/resources/mapper/CompetitionMapper.xml
index a21f30f..61bb70a 100644
--- a/cloud-server-competition/src/main/resources/mapper/CompetitionMapper.xml
+++ b/cloud-server-competition/src/main/resources/mapper/CompetitionMapper.xml
@@ -13,9 +13,8 @@
a.registerCondition,
a.introduction,
DATE_FORMAT(a.registerEndTime, '%Y-%m-%d %H:%i') as registerEndTime,
- CONCAT(a.startAge, '-', a.endAge) as age,
-
- (a.baseNumber + a.applicantsNumber) as heat
+ CONCAT(a.startAge, '-', a.endAge) as `age`,
+ (a.baseNumber + a.applicantsNumber) as `heat`
from t_competition a
where a.auditStatus = 2 and a.`status` = 2 and a.state = 1
<if test="null != cityCode and '' != cityCode">
--
Gitblit v1.7.1