Merge branch '20250425-wyp-gzhPlan' into test

# Conflicts:
#	api-module/src/main/java/com/tzld/piaoquan/api/service/contentplatform/impl/ContentPlatformPlanServiceImpl.java

api-module/src/main/java/com/tzld/piaoquan/api/service/contentplatform/impl/ContentPlatformPlanServiceImpl.java

@@ -230,7 +230,7 @@ public class ContentPlatformPlanServiceImpl implements ContentPlatformPlanServic
         ContentPlatformAccount loginAccount = LoginUserContext.getUser();
         List<ContentPlatformGzhPlan> planExistList = planMapperExt.getGzhPlanExists(param.getAccountId(),
                 param.getType(), param.getScene(), param.getId());
-        if (CollectionUtils.isNotEmpty(planExistList)) {
+        if (CollectionUtils.isNotEmpty(planExistList) && param.getType() != ContentPlatformGzhPlanTypeEnum.FWH_PUSH.getVal()) {
             throw new CommonException(ExceptionEnum.GZH_SCENE_PLAN_EXISTS);
         }
         if (param.getVideoList().size() > 3) {