From 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 14 六月 2024 19:41:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-other/src/main/java/com/dsh/other/controller/HonorController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/HonorController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/HonorController.java
index 17ee0c5..38daf8b 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/HonorController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/HonorController.java
@@ -106,7 +106,7 @@
public HonorRules getHonor(@RequestBody List<Integer> integers) {
HonorRules one = honorRulesService.getOne(new QueryWrapper<HonorRules>()
.eq("type", integers.get(0))
- .le("`condition`", integers.get(1)).orderByDesc("condition")
+ .le("`condition`", integers.get(1)).orderByDesc("`condition`")
.last("LIMIT 1"));
if (one == null) {
@@ -150,10 +150,10 @@
stuMedalVo.setMedalName("深度玩家");
break;
case 5:
- stuMedalVo.setMedalName("赢家");
+ stuMedalVo.setMedalName("常胜将军");
break;
case 6:
- stuMedalVo.setMedalName("次数");
+ stuMedalVo.setMedalName("越战越勇");
break;
default:
break;
--
Gitblit v1.7.1