Merge remote-tracking branch 'origin/master'

lisy

2023-07-26 4dad3d9a5bfc1b08c5338640e1f1d18c2b86ef45

 cloud-server-competition/src/main/resources/mapper/CompetitionMapper.xml

@@ -14,6 +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
            from t_competition a
            where a.auditStatus = 2 and a.`status` = 2 and a.state = 1