Merge remote-tracking branch 'origin/master'
| | |
| | | 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 |
| | |
| | | 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"> |
| | |
| | | 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> |
| | | |