Merge branch 'mj' into dev

netflix-dao/src/main/java/com/cyksj/model/entity/MidjourneyUserConversation.java

@@ -94,4 +94,9 @@ public class MidjourneyUserConversation extends BaseEntity implements Serializab
      */
     private String properties;
 
+    /**
+     * 书签
+     */
+    private Boolean bookmark;
+
 }

netflix-service/src/main/java/com/cyksj/service/midjourney/impl/MidjourneyServiceImpl.java

@@ -139,7 +139,11 @@ public class MidjourneyServiceImpl implements MidjourneyService {
                 }
             });
         }
+        conversation.setBookmark(customId.contains("BOOKMARK"));
         conversationMapper.updateById(conversation);
+        if (conversation.getBookmark()) {
+            return conversation;
+        }
         Map<String, Object> param = MapUtil.builder(new HashMap<String,Object>())
                 .put("taskId", taskId).put("state", user.getId()).put("customId", customId).build();
         SubmitResult result = submit(user.getMode(),"action", param);