fix: 合并error

launch-admin/src/main/java/com/webflux/launchadmin/mysql/service/planNew/goGenerate/GoGenerateService.java

@@ -967,7 +967,7 @@ public class GoGenerateService {
                 return Mono.just(setPlanNewCommon(listeningPlanNew.groupId(), listeningPlanNew.code()));
             }
         });
-        Mono<List<DomainSelect>> domainSelectMono = planNewCommonMono1.flatMap(f -> template.select(Query.query(Criteria
+       Mono<List<DomainSelect>> domainSelectMono = planNewCommonMono1.flatMap(f -> template.select(Query.query(Criteria
                         .where("group_type_id").is(isQs ? groupIdQs : f.groupId())
                         .and("status").is(1)
                         .and("type").is(1)
@@ -1379,14 +1379,14 @@ public class GoGenerateService {
     }
 
 
-    public Mono<RStatus<Poster>> updatePoster1() {
-        Mono<RStatus<Poster>> poster_id = template.selectOne(Query.query(Criteria.where("poster_id").is(37)), Poster.class).flatMap(f -> {
+    public Mono<String> updatePoster1(){
+        Mono<String> poster_id = template.selectOne(Query.query(Criteria.where("poster_id").is(37)), Poster.class).flatMap(f -> {
 
             PosterRequest posterRequest = new PosterRequest();
             posterRequest.setPosterId(f.posterId());
             posterRequest.setPosterTemplate(f.posterTemplate());
             posterRequest.setPosterTemplateId(f.posterTemplateId());
-            // Mono<RStatus<Poster>> rStatusMono = updatePoster(posterRequest);
+            //Mono<RStatus<Poster>> rStatusMono = updatePoster(posterRequest);
             String s = goGenerate(JSONUtil.toJsonStr(f.posterTemplate()));
             // System.out.println(s);
             return Mono.just(s);