Merge branch 'dev' into 'master'

活动上架取消判断是否添加了计划

See merge request !7

cloud-training-project-service/src/main/java/com/yizhi/training/application/controller/TrainingProjectController.java

@@ -126,6 +126,7 @@ public class TrainingProjectController {
     @PostMapping(value = "/up")
     public Integer up(@RequestBody Map<String, Long> map){
         Long id = map.get("id");
+        /*//活动不是必添加项目，注释2025-1-20
         // 检查是否有学习活动
         TpPlanActivity activity = new TpPlanActivity();
         activity.setTrainingProjectId(id);
@@ -134,7 +135,8 @@ public class TrainingProjectController {
         if (tpPlanActivityService.selectCount(new EntityWrapper<>(activity)) < 1) {
             LOGGER.error("没有添加学习活动，不能上架！");
             return -1;
-        }
+        }*/
+        
         TrainingProject trainingProject = trainingProjectService.selectById(id);
         if (trainingProject.getStatus() == 0 || trainingProject.getStatus() == 2) {
             trainingProject.setStatus(1);