Merge "修改了所有前端整体设计 整合现有的创作中心，悬赏中心 修改菜单栏，对应的路由定向 整体界面为深色，界面配色，加入了星球基本样式和背景色设计动效 修改了悬赏中心的一点小bug，留出个人信息卡片，排行榜通知公告空间"
diff --git a/.gitignore b/.gitignore
index b5b4119..64edc69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,7 +41,7 @@
*.log
*.xml.versionsBackup
*.swp
-
+.vscode/settings.json
!*/build/*.java
!*/build/*.html
!*/build/*.xml
diff --git a/.vscode/settings.json b/.vscode/settings.json
index e5c786f..1546a32 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -17,5 +17,6 @@
"other": "on",
"comments": "off",
"strings": "on"
- }
+ },
+ "workbench.colorCustomizations": {}
}
\ No newline at end of file
diff --git a/Redis-x64-5.0.14.1/dump.rdb b/Redis-x64-5.0.14.1/dump.rdb
index 2e2619f..f40c53c 100644
--- a/Redis-x64-5.0.14.1/dump.rdb
+++ b/Redis-x64-5.0.14.1/dump.rdb
Binary files differ
diff --git a/ruoyi-system/src/main/java/bounty/controller/BountyController.java b/ruoyi-system/src/main/java/bounty/controller/BountyController.java
index 7c47e1b..333887f 100644
--- a/ruoyi-system/src/main/java/bounty/controller/BountyController.java
+++ b/ruoyi-system/src/main/java/bounty/controller/BountyController.java
@@ -37,6 +37,7 @@
@GetMapping("/{id}")
public ResponseEntity<Bounty> getBountyById(@PathVariable Long id) {
Bounty bounty = bountyService.getBountyById(id);
+ System.out.println(bounty);
if (bounty == null) {
return ResponseEntity.notFound().build();
} else {
diff --git a/ruoyi-system/src/main/resources/mapper/bounty/BountyMapper.xml b/ruoyi-system/src/main/resources/mapper/bounty/BountyMapper.xml
index 731572a..3267ef2 100644
--- a/ruoyi-system/src/main/resources/mapper/bounty/BountyMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/bounty/BountyMapper.xml
@@ -51,6 +51,7 @@
<result property="reward" column="reward"/>
<result property="deadline" column="deadline"/>
<result property="status" column="status"/>
+ <result property="creator_id" column="creator_id"/>
<!-- 关联查询回复列表，填充到 submissions 字段 -->
<collection
property="submissions"