Merge remote-tracking branch 'origin/master'

liujie

2023-08-04 1f9d05fd255fbd21356dad37527c7d33fda4fb8b

 cloud-server-competition/src/main/java/com/dsh/competition/mapper/CompetitionMapper.java

@@ -27,7 +27,7 @@
     * @return
     */
    List<CompetitionListVo> queryCompetitionList(@Param("cityCode") String cityCode, @Param("content") String content,
                                                 @Param("registerCondition") Integer registerCondition, @Param("heat") Integer heat);
                                                 @Param("registerCondition") Integer registerCondition, @Param("heat") String heat);


    /**