From 1cb12391db6154f2d1a8fdf8e0506fe3f3eb2f15 Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期日, 08 十月 2023 16:19:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-competition/src/main/java/com/dsh/competition/mapper/CompetitionMapper.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/mapper/CompetitionMapper.java b/cloud-server-competition/src/main/java/com/dsh/competition/mapper/CompetitionMapper.java
index f1c1c47..9c34c67 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/mapper/CompetitionMapper.java
+++ b/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);
/**
--
Gitblit v1.7.1