From 14949a6a6e7dec654d13e75f46b24319a624ff8b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 30 Oct 2023 17:13:34 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-api/src/main/java/com/moral/api/controller/CruiserController.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/CruiserController.java b/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
index 6b5b362..e06aadb 100644
--- a/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
@@ -256,9 +256,9 @@
if (ObjectUtils.isEmpty(map)){
return ResultMessage.fail(ResponseCodeEnum.TARGET_IS_NULL.getCode(), ResponseCodeEnum.TARGET_IS_NULL.getMsg());
}
-// test(map,response);
+ test(map,response);
// return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(),ResponseCodeEnum.SUCCESS.getMsg(),map);
- return ResultMessage.ok(map);
+ return ResultMessage.ok();
}
@@ -364,7 +364,6 @@
map.put("date2",params.get("date2").toString());
// map.put("data",params.get("data").toString());
compile.render(map);
-// response.addHeader("Access-Contro1-Allow-Origin", "*");
compile.write(response.getOutputStream());
compile.close();
} catch (IOException e) {
--
Gitblit v1.8.0