Merge branch 'mj' into dev

netflix-web/src/main/java/com/cyksj/web/controller/mirror/MirrorController.java

@@ -309,7 +309,7 @@ public class MirrorController {
      * @param relationId 车票id
      */
     @GetMapping("/midjourneyMirror/{relationId}")
-    public void midjourneyMirror(@PathVariable Long relationId) throws IOException {
+    public void midjourneyMirror(@PathVariable Long relationId,HttpServletResponse response) throws IOException {
         Long userId = StpUserUtil.getLoginIdAsLong();
         String userToken = midjourneyAccountService.getMidjourneyUserToken(userId, relationId);
         Cookie cookie = new Cookie("userToken", userToken);