From ecc9d2ee0d7825a0391632e124170676787e1a88 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 26 七月 2023 09:22:06 +0800
Subject: [PATCH] 同步代码

---
 cloud-server-competition/src/main/resources/bootstrap.properties         |    5 +----
 cloud-server-competition/src/main/resources/mapper/CompetitionMapper.xml |    4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/cloud-server-competition/src/main/resources/bootstrap.properties b/cloud-server-competition/src/main/resources/bootstrap.properties
index f70b6b8..9f4c0e8 100644
--- a/cloud-server-competition/src/main/resources/bootstrap.properties
+++ b/cloud-server-competition/src/main/resources/bootstrap.properties
@@ -23,7 +23,4 @@
 feign.compression.request.mime-types=text/xml,application/xml,application/json
 feign.compression.request.min-request-size=4096
 feign.compression.request.enabled=true
-feign.compression.response.enabled=true
-
-
-mybatis-plus.configuration.map-underscore-to-camel-case=false
\ No newline at end of file
+feign.compression.response.enabled=true
\ No newline at end of file
diff --git a/cloud-server-competition/src/main/resources/mapper/CompetitionMapper.xml b/cloud-server-competition/src/main/resources/mapper/CompetitionMapper.xml
index 2b8b8e5..c54ce7a 100644
--- a/cloud-server-competition/src/main/resources/mapper/CompetitionMapper.xml
+++ b/cloud-server-competition/src/main/resources/mapper/CompetitionMapper.xml
@@ -14,7 +14,7 @@
             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
+            (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">
@@ -29,7 +29,7 @@
             order by a.insertTime desc
         ) as aa
         <if test="null != heat and '' != heat">
-            order by aa.heat #{heat}
+            order by aa.heat ${heat}
         </if>
     </select>
 

--
Gitblit v1.7.1