Merge remote-tracking branch 'origin/master'

liujie

2023-07-26 a6ae71397f9ef0ca87f20316a9bc7f227749eb31

Merge remote-tracking branch 'origin/master'

 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
feign.compression.response.enabled=true

 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>