fix bugs

.claude/settings.local.json

@@ -25,7 +25,9 @@
       "Bash(mvn spring-boot:run:*)",
       "Bash(curl:*)",
       "Bash(python -m json.tool:*)",
-      "Bash(\"/d/Program Files/mysql-8.0.32-winx64/bin/mysql\" -h localhost -P 3306 -u root -p123456 -D martial_db -e \"\nSELECT \n    TABLE_NAME,\n    CASE WHEN SUM(COLUMN_NAME = ''status'') > 0 THEN ''✓'' ELSE ''✗'' END AS has_status\nFROM information_schema.COLUMNS \nWHERE TABLE_SCHEMA = ''martial_db'' \n  AND TABLE_NAME IN (''martial_athlete'', ''martial_live_update'', ''martial_result'', ''martial_schedule_athlete'')\nGROUP BY TABLE_NAME\nORDER BY TABLE_NAME;\n\")"
+      "Bash(\"/d/Program Files/mysql-8.0.32-winx64/bin/mysql\" -h localhost -P 3306 -u root -p123456 -D martial_db -e \"\nSELECT \n    TABLE_NAME,\n    CASE WHEN SUM(COLUMN_NAME = ''status'') > 0 THEN ''✓'' ELSE ''✗'' END AS has_status\nFROM information_schema.COLUMNS \nWHERE TABLE_SCHEMA = ''martial_db'' \n  AND TABLE_NAME IN (''martial_athlete'', ''martial_live_update'', ''martial_result'', ''martial_schedule_athlete'')\nGROUP BY TABLE_NAME\nORDER BY TABLE_NAME;\n\")",
+      "Bash(git add:*)",
+      "Bash(git commit -m \"$(cat <<''EOF''\nMerge remote-tracking branch ''origin/main''\n\n解决目录重组冲突:\n- doc/ → docs/ (文档目录重命名)\n- doc/sql/ → database/ (数据库脚本目录重组)\n- doc/script/ → scripts/ (脚本目录重组)\n\n保留本地新增的武术比赛系统文件:\n- docs/sql/mysql/martial-*.sql (4个数据库脚本)\n- docs/后端开发完成报告.md\n- docs/数据库字段检查报告.md  \n- docs/问题修复报告.md\n\n🤖 Generated with [Claude Code](https://claude.com/claude-code)\n\nCo-Authored-By: Claude <noreply@anthropic.com>\nEOF\n)\")"
     ],
     "deny": [],
     "ask": []

src/main/java/org/springblade/modules/martial/controller/MartialActivityScheduleController.java

@@ -9,7 +9,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.martial.entity.MartialActivitySchedule;
+import org.springblade.modules.martial.pojo.entity.MartialActivitySchedule;
 import org.springblade.modules.martial.service.IMartialActivityScheduleService;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/org/springblade/modules/martial/controller/MartialAthleteController.java

@@ -9,7 +9,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.martial.entity.MartialAthlete;
+import org.springblade.modules.martial.pojo.entity.MartialAthlete;
 import org.springblade.modules.martial.service.IMartialAthleteService;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/org/springblade/modules/martial/controller/MartialBannerController.java

@@ -9,7 +9,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.martial.entity.MartialBanner;
+import org.springblade.modules.martial.pojo.entity.MartialBanner;
 import org.springblade.modules.martial.service.IMartialBannerService;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/org/springblade/modules/martial/controller/MartialCompetitionController.java

@@ -9,7 +9,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.martial.entity.MartialCompetition;
+import org.springblade.modules.martial.pojo.entity.MartialCompetition;
 import org.springblade.modules.martial.service.IMartialCompetitionService;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/org/springblade/modules/martial/controller/MartialDeductionItemController.java

@@ -9,7 +9,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.martial.entity.MartialDeductionItem;
+import org.springblade.modules.martial.pojo.entity.MartialDeductionItem;
 import org.springblade.modules.martial.service.IMartialDeductionItemService;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/org/springblade/modules/martial/controller/MartialInfoPublishController.java

@@ -9,7 +9,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.martial.entity.MartialInfoPublish;
+import org.springblade.modules.martial.pojo.entity.MartialInfoPublish;
 import org.springblade.modules.martial.service.IMartialInfoPublishService;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/org/springblade/modules/martial/controller/MartialJudgeController.java

@@ -9,7 +9,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.martial.entity.MartialJudge;
+import org.springblade.modules.martial.pojo.entity.MartialJudge;
 import org.springblade.modules.martial.service.IMartialJudgeService;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/org/springblade/modules/martial/controller/MartialJudgeInviteController.java

@@ -9,7 +9,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.martial.entity.MartialJudgeInvite;
+import org.springblade.modules.martial.pojo.entity.MartialJudgeInvite;
 import org.springblade.modules.martial.service.IMartialJudgeInviteService;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/org/springblade/modules/martial/controller/MartialLiveUpdateController.java

@@ -9,7 +9,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.martial.entity.MartialLiveUpdate;
+import org.springblade.modules.martial.pojo.entity.MartialLiveUpdate;
 import org.springblade.modules.martial.service.IMartialLiveUpdateService;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/org/springblade/modules/martial/controller/MartialProjectController.java

@@ -9,7 +9,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.martial.entity.MartialProject;
+import org.springblade.modules.martial.pojo.entity.MartialProject;
 import org.springblade.modules.martial.service.IMartialProjectService;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/org/springblade/modules/martial/controller/MartialRegistrationOrderController.java

@@ -9,7 +9,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.martial.entity.MartialRegistrationOrder;
+import org.springblade.modules.martial.pojo.entity.MartialRegistrationOrder;
 import org.springblade.modules.martial.service.IMartialRegistrationOrderService;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/org/springblade/modules/martial/controller/MartialResultController.java

@@ -9,7 +9,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.martial.entity.MartialResult;
+import org.springblade.modules.martial.pojo.entity.MartialResult;
 import org.springblade.modules.martial.service.IMartialResultService;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/org/springblade/modules/martial/controller/MartialScheduleAthleteController.java

@@ -9,7 +9,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.martial.entity.MartialScheduleAthlete;
+import org.springblade.modules.martial.pojo.entity.MartialScheduleAthlete;
 import org.springblade.modules.martial.service.IMartialScheduleAthleteService;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/org/springblade/modules/martial/controller/MartialScheduleController.java

@@ -9,7 +9,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.martial.entity.MartialSchedule;
+import org.springblade.modules.martial.pojo.entity.MartialSchedule;
 import org.springblade.modules.martial.service.IMartialScheduleService;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/org/springblade/modules/martial/controller/MartialScoreController.java

@@ -9,7 +9,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.martial.entity.MartialScore;
+import org.springblade.modules.martial.pojo.entity.MartialScore;
 import org.springblade.modules.martial.service.IMartialScoreService;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/org/springblade/modules/martial/controller/MartialVenueController.java

@@ -9,7 +9,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.martial.entity.MartialVenue;
+import org.springblade.modules.martial.pojo.entity.MartialVenue;
 import org.springblade.modules.martial.service.IMartialVenueService;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/org/springblade/modules/martial/mapper/MartialActivityScheduleMapper.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.modules.martial.entity.MartialActivitySchedule;
+import org.springblade.modules.martial.pojo.entity.MartialActivitySchedule;
 
 /**
  * ActivitySchedule Mapper 接口

src/main/java/org/springblade/modules/martial/mapper/MartialAthleteMapper.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.modules.martial.entity.MartialAthlete;
+import org.springblade.modules.martial.pojo.entity.MartialAthlete;
 
 /**
  * Athlete Mapper 接口

src/main/java/org/springblade/modules/martial/mapper/MartialBannerMapper.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.modules.martial.entity.MartialBanner;
+import org.springblade.modules.martial.pojo.entity.MartialBanner;
 
 /**
  * Banner Mapper 接口

src/main/java/org/springblade/modules/martial/mapper/MartialCompetitionMapper.java

@@ -17,7 +17,7 @@
 package org.springblade.modules.martial.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.modules.martial.entity.MartialCompetition;
+import org.springblade.modules.martial.pojo.entity.MartialCompetition;
 
 /**
  * 赛事信息 Mapper 接口

src/main/java/org/springblade/modules/martial/mapper/MartialDeductionItemMapper.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.modules.martial.entity.MartialDeductionItem;
+import org.springblade.modules.martial.pojo.entity.MartialDeductionItem;
 
 /**
  * DeductionItem Mapper 接口

src/main/java/org/springblade/modules/martial/mapper/MartialInfoPublishMapper.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.modules.martial.entity.MartialInfoPublish;
+import org.springblade.modules.martial.pojo.entity.MartialInfoPublish;
 
 /**
  * InfoPublish Mapper 接口

src/main/java/org/springblade/modules/martial/mapper/MartialJudgeInviteMapper.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.modules.martial.entity.MartialJudgeInvite;
+import org.springblade.modules.martial.pojo.entity.MartialJudgeInvite;
 
 /**
  * JudgeInvite Mapper 接口

src/main/java/org/springblade/modules/martial/mapper/MartialJudgeMapper.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.modules.martial.entity.MartialJudge;
+import org.springblade.modules.martial.pojo.entity.MartialJudge;
 
 /**
  * Judge Mapper 接口

src/main/java/org/springblade/modules/martial/mapper/MartialLiveUpdateMapper.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.modules.martial.entity.MartialLiveUpdate;
+import org.springblade.modules.martial.pojo.entity.MartialLiveUpdate;
 
 /**
  * LiveUpdate Mapper 接口

src/main/java/org/springblade/modules/martial/mapper/MartialProjectMapper.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.modules.martial.entity.MartialProject;
+import org.springblade.modules.martial.pojo.entity.MartialProject;
 
 /**
  * Project Mapper 接口

src/main/java/org/springblade/modules/martial/mapper/MartialRegistrationOrderMapper.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.modules.martial.entity.MartialRegistrationOrder;
+import org.springblade.modules.martial.pojo.entity.MartialRegistrationOrder;
 
 /**
  * RegistrationOrder Mapper 接口

src/main/java/org/springblade/modules/martial/mapper/MartialResultMapper.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.modules.martial.entity.MartialResult;
+import org.springblade.modules.martial.pojo.entity.MartialResult;
 
 /**
  * Result Mapper 接口

src/main/java/org/springblade/modules/martial/mapper/MartialScheduleAthleteMapper.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.modules.martial.entity.MartialScheduleAthlete;
+import org.springblade.modules.martial.pojo.entity.MartialScheduleAthlete;
 
 /**
  * ScheduleAthlete Mapper 接口

src/main/java/org/springblade/modules/martial/mapper/MartialScheduleMapper.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.modules.martial.entity.MartialSchedule;
+import org.springblade.modules.martial.pojo.entity.MartialSchedule;
 
 /**
  * Schedule Mapper 接口

src/main/java/org/springblade/modules/martial/mapper/MartialScoreMapper.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.modules.martial.entity.MartialScore;
+import org.springblade.modules.martial.pojo.entity.MartialScore;
 
 /**
  * Score Mapper 接口

src/main/java/org/springblade/modules/martial/mapper/MartialVenueMapper.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.modules.martial.entity.MartialVenue;
+import org.springblade.modules.martial.pojo.entity.MartialVenue;
 
 /**
  * Venue Mapper 接口

src/main/java/org/springblade/modules/martial/pojo/entity/MartialActivitySchedule.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.modules.martial.entity;
+package org.springblade.modules.martial.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;

src/main/java/org/springblade/modules/martial/pojo/entity/MartialAthlete.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.modules.martial.entity;
+package org.springblade.modules.martial.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;

src/main/java/org/springblade/modules/martial/pojo/entity/MartialBanner.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.modules.martial.entity;
+package org.springblade.modules.martial.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;

src/main/java/org/springblade/modules/martial/pojo/entity/MartialCompetition.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.modules.martial.entity;
+package org.springblade.modules.martial.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;

src/main/java/org/springblade/modules/martial/pojo/entity/MartialDeductionItem.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.modules.martial.entity;
+package org.springblade.modules.martial.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;

src/main/java/org/springblade/modules/martial/pojo/entity/MartialInfoPublish.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.modules.martial.entity;
+package org.springblade.modules.martial.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;

src/main/java/org/springblade/modules/martial/pojo/entity/MartialJudge.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.modules.martial.entity;
+package org.springblade.modules.martial.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;

src/main/java/org/springblade/modules/martial/pojo/entity/MartialJudgeInvite.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.modules.martial.entity;
+package org.springblade.modules.martial.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;

src/main/java/org/springblade/modules/martial/pojo/entity/MartialLiveUpdate.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.modules.martial.entity;
+package org.springblade.modules.martial.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;

src/main/java/org/springblade/modules/martial/pojo/entity/MartialProject.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.modules.martial.entity;
+package org.springblade.modules.martial.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;

src/main/java/org/springblade/modules/martial/pojo/entity/MartialRegistrationOrder.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.modules.martial.entity;
+package org.springblade.modules.martial.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;

src/main/java/org/springblade/modules/martial/pojo/entity/MartialResult.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.modules.martial.entity;
+package org.springblade.modules.martial.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;

src/main/java/org/springblade/modules/martial/pojo/entity/MartialSchedule.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.modules.martial.entity;
+package org.springblade.modules.martial.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;

src/main/java/org/springblade/modules/martial/pojo/entity/MartialScheduleAthlete.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.modules.martial.entity;
+package org.springblade.modules.martial.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;

src/main/java/org/springblade/modules/martial/pojo/entity/MartialScore.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.modules.martial.entity;
+package org.springblade.modules.martial.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;

src/main/java/org/springblade/modules/martial/pojo/entity/MartialVenue.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.modules.martial.entity;
+package org.springblade.modules.martial.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;

src/main/java/org/springblade/modules/martial/pojo/vo/MartialAthleteVO.java

@@ -1,9 +1,9 @@
-package org.springblade.modules.martial.vo;
+package org.springblade.modules.martial.pojo.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.modules.martial.entity.MartialAthlete;
+import org.springblade.modules.martial.pojo.entity.MartialAthlete;
 
 import java.math.BigDecimal;
 import java.util.List;

src/main/java/org/springblade/modules/martial/pojo/vo/MartialCompetitionVO.java

@@ -1,9 +1,9 @@
-package org.springblade.modules.martial.vo;
+package org.springblade.modules.martial.pojo.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.modules.martial.entity.MartialCompetition;
+import org.springblade.modules.martial.pojo.entity.MartialCompetition;
 
 /**
  * 赛事信息视图实体类

src/main/java/org/springblade/modules/martial/pojo/vo/MartialResultVO.java

@@ -1,9 +1,9 @@
-package org.springblade.modules.martial.vo;
+package org.springblade.modules.martial.pojo.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.modules.martial.entity.MartialResult;
+import org.springblade.modules.martial.pojo.entity.MartialResult;
 
 /**
  * 成绩表视图实体类

src/main/java/org/springblade/modules/martial/pojo/vo/MartialScoreVO.java

@@ -1,9 +1,9 @@
-package org.springblade.modules.martial.vo;
+package org.springblade.modules.martial.pojo.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.modules.martial.entity.MartialScore;
+import org.springblade.modules.martial.pojo.entity.MartialScore;
 
 /**
  * 评分记录视图实体类

src/main/java/org/springblade/modules/martial/service/IMartialActivityScheduleService.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.modules.martial.entity.MartialActivitySchedule;
+import org.springblade.modules.martial.pojo.entity.MartialActivitySchedule;
 
 /**
  * ActivitySchedule 服务类

src/main/java/org/springblade/modules/martial/service/IMartialAthleteService.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.modules.martial.entity.MartialAthlete;
+import org.springblade.modules.martial.pojo.entity.MartialAthlete;
 
 /**
  * Athlete 服务类

src/main/java/org/springblade/modules/martial/service/IMartialBannerService.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.modules.martial.entity.MartialBanner;
+import org.springblade.modules.martial.pojo.entity.MartialBanner;
 
 /**
  * Banner 服务类

src/main/java/org/springblade/modules/martial/service/IMartialCompetitionService.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.modules.martial.entity.MartialCompetition;
+import org.springblade.modules.martial.pojo.entity.MartialCompetition;
 
 /**
  * Competition 服务类

src/main/java/org/springblade/modules/martial/service/IMartialDeductionItemService.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.modules.martial.entity.MartialDeductionItem;
+import org.springblade.modules.martial.pojo.entity.MartialDeductionItem;
 
 /**
  * DeductionItem 服务类

src/main/java/org/springblade/modules/martial/service/IMartialInfoPublishService.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.modules.martial.entity.MartialInfoPublish;
+import org.springblade.modules.martial.pojo.entity.MartialInfoPublish;
 
 /**
  * InfoPublish 服务类

src/main/java/org/springblade/modules/martial/service/IMartialJudgeInviteService.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.modules.martial.entity.MartialJudgeInvite;
+import org.springblade.modules.martial.pojo.entity.MartialJudgeInvite;
 
 /**
  * JudgeInvite 服务类

src/main/java/org/springblade/modules/martial/service/IMartialJudgeService.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.modules.martial.entity.MartialJudge;
+import org.springblade.modules.martial.pojo.entity.MartialJudge;
 
 /**
  * Judge 服务类

src/main/java/org/springblade/modules/martial/service/IMartialLiveUpdateService.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.modules.martial.entity.MartialLiveUpdate;
+import org.springblade.modules.martial.pojo.entity.MartialLiveUpdate;
 
 /**
  * LiveUpdate 服务类

src/main/java/org/springblade/modules/martial/service/IMartialProjectService.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.modules.martial.entity.MartialProject;
+import org.springblade.modules.martial.pojo.entity.MartialProject;
 
 /**
  * Project 服务类

src/main/java/org/springblade/modules/martial/service/IMartialRegistrationOrderService.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.modules.martial.entity.MartialRegistrationOrder;
+import org.springblade.modules.martial.pojo.entity.MartialRegistrationOrder;
 
 /**
  * RegistrationOrder 服务类

src/main/java/org/springblade/modules/martial/service/IMartialResultService.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.modules.martial.entity.MartialResult;
+import org.springblade.modules.martial.pojo.entity.MartialResult;
 
 /**
  * Result 服务类

src/main/java/org/springblade/modules/martial/service/IMartialScheduleAthleteService.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.modules.martial.entity.MartialScheduleAthlete;
+import org.springblade.modules.martial.pojo.entity.MartialScheduleAthlete;
 
 /**
  * ScheduleAthlete 服务类

src/main/java/org/springblade/modules/martial/service/IMartialScheduleService.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.modules.martial.entity.MartialSchedule;
+import org.springblade.modules.martial.pojo.entity.MartialSchedule;
 
 /**
  * Schedule 服务类

src/main/java/org/springblade/modules/martial/service/IMartialScoreService.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.modules.martial.entity.MartialScore;
+import org.springblade.modules.martial.pojo.entity.MartialScore;
 
 /**
  * Score 服务类

src/main/java/org/springblade/modules/martial/service/IMartialVenueService.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.modules.martial.entity.MartialVenue;
+import org.springblade.modules.martial.pojo.entity.MartialVenue;
 
 /**
  * Venue 服务类

src/main/java/org/springblade/modules/martial/service/impl/MartialActivityScheduleServiceImpl.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.modules.martial.entity.MartialActivitySchedule;
+import org.springblade.modules.martial.pojo.entity.MartialActivitySchedule;
 import org.springblade.modules.martial.mapper.MartialActivityScheduleMapper;
 import org.springblade.modules.martial.service.IMartialActivityScheduleService;
 import org.springframework.stereotype.Service;

src/main/java/org/springblade/modules/martial/service/impl/MartialAthleteServiceImpl.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.modules.martial.entity.MartialAthlete;
+import org.springblade.modules.martial.pojo.entity.MartialAthlete;
 import org.springblade.modules.martial.mapper.MartialAthleteMapper;
 import org.springblade.modules.martial.service.IMartialAthleteService;
 import org.springframework.stereotype.Service;

src/main/java/org/springblade/modules/martial/service/impl/MartialBannerServiceImpl.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.modules.martial.entity.MartialBanner;
+import org.springblade.modules.martial.pojo.entity.MartialBanner;
 import org.springblade.modules.martial.mapper.MartialBannerMapper;
 import org.springblade.modules.martial.service.IMartialBannerService;
 import org.springframework.stereotype.Service;

src/main/java/org/springblade/modules/martial/service/impl/MartialCompetitionServiceImpl.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.modules.martial.entity.MartialCompetition;
+import org.springblade.modules.martial.pojo.entity.MartialCompetition;
 import org.springblade.modules.martial.mapper.MartialCompetitionMapper;
 import org.springblade.modules.martial.service.IMartialCompetitionService;
 import org.springframework.stereotype.Service;

src/main/java/org/springblade/modules/martial/service/impl/MartialDeductionItemServiceImpl.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.modules.martial.entity.MartialDeductionItem;
+import org.springblade.modules.martial.pojo.entity.MartialDeductionItem;
 import org.springblade.modules.martial.mapper.MartialDeductionItemMapper;
 import org.springblade.modules.martial.service.IMartialDeductionItemService;
 import org.springframework.stereotype.Service;

src/main/java/org/springblade/modules/martial/service/impl/MartialInfoPublishServiceImpl.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.modules.martial.entity.MartialInfoPublish;
+import org.springblade.modules.martial.pojo.entity.MartialInfoPublish;
 import org.springblade.modules.martial.mapper.MartialInfoPublishMapper;
 import org.springblade.modules.martial.service.IMartialInfoPublishService;
 import org.springframework.stereotype.Service;

src/main/java/org/springblade/modules/martial/service/impl/MartialJudgeInviteServiceImpl.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.modules.martial.entity.MartialJudgeInvite;
+import org.springblade.modules.martial.pojo.entity.MartialJudgeInvite;
 import org.springblade.modules.martial.mapper.MartialJudgeInviteMapper;
 import org.springblade.modules.martial.service.IMartialJudgeInviteService;
 import org.springframework.stereotype.Service;

src/main/java/org/springblade/modules/martial/service/impl/MartialJudgeServiceImpl.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.modules.martial.entity.MartialJudge;
+import org.springblade.modules.martial.pojo.entity.MartialJudge;
 import org.springblade.modules.martial.mapper.MartialJudgeMapper;
 import org.springblade.modules.martial.service.IMartialJudgeService;
 import org.springframework.stereotype.Service;

src/main/java/org/springblade/modules/martial/service/impl/MartialLiveUpdateServiceImpl.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.modules.martial.entity.MartialLiveUpdate;
+import org.springblade.modules.martial.pojo.entity.MartialLiveUpdate;
 import org.springblade.modules.martial.mapper.MartialLiveUpdateMapper;
 import org.springblade.modules.martial.service.IMartialLiveUpdateService;
 import org.springframework.stereotype.Service;

src/main/java/org/springblade/modules/martial/service/impl/MartialProjectServiceImpl.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.modules.martial.entity.MartialProject;
+import org.springblade.modules.martial.pojo.entity.MartialProject;
 import org.springblade.modules.martial.mapper.MartialProjectMapper;
 import org.springblade.modules.martial.service.IMartialProjectService;
 import org.springframework.stereotype.Service;

src/main/java/org/springblade/modules/martial/service/impl/MartialRegistrationOrderServiceImpl.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.modules.martial.entity.MartialRegistrationOrder;
+import org.springblade.modules.martial.pojo.entity.MartialRegistrationOrder;
 import org.springblade.modules.martial.mapper.MartialRegistrationOrderMapper;
 import org.springblade.modules.martial.service.IMartialRegistrationOrderService;
 import org.springframework.stereotype.Service;

src/main/java/org/springblade/modules/martial/service/impl/MartialResultServiceImpl.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.modules.martial.entity.MartialResult;
+import org.springblade.modules.martial.pojo.entity.MartialResult;
 import org.springblade.modules.martial.mapper.MartialResultMapper;
 import org.springblade.modules.martial.service.IMartialResultService;
 import org.springframework.stereotype.Service;

src/main/java/org/springblade/modules/martial/service/impl/MartialScheduleAthleteServiceImpl.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.modules.martial.entity.MartialScheduleAthlete;
+import org.springblade.modules.martial.pojo.entity.MartialScheduleAthlete;
 import org.springblade.modules.martial.mapper.MartialScheduleAthleteMapper;
 import org.springblade.modules.martial.service.IMartialScheduleAthleteService;
 import org.springframework.stereotype.Service;

src/main/java/org/springblade/modules/martial/service/impl/MartialScheduleServiceImpl.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.modules.martial.entity.MartialSchedule;
+import org.springblade.modules.martial.pojo.entity.MartialSchedule;
 import org.springblade.modules.martial.mapper.MartialScheduleMapper;
 import org.springblade.modules.martial.service.IMartialScheduleService;
 import org.springframework.stereotype.Service;

src/main/java/org/springblade/modules/martial/service/impl/MartialScoreServiceImpl.java

@@ -1,7 +1,7 @@
 package org.springblade.modules.martial.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.modules.martial.entity.MartialScore;
+import org.springblade.modules.martial.pojo.entity.MartialScore;
 import org.springblade.modules.martial.mapper.MartialScoreMapper;
 import org.springblade.modules.martial.service.IMartialScoreService;
 import org.springframework.stereotype.Service;