Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-11-01 8e524f6e570fca66f670a8072edefc6ca2d4e2f9

 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);


    /**