From 021640e69b32dbd9b88a538402671c47f280df9e Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期三, 31 一月 2024 15:50:00 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into dev
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/NettyController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/NettyController.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/NettyController.java
index 9d74868..28faf7c 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/NettyController.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/NettyController.java
@@ -1,6 +1,7 @@
package com.stylefeng.guns.modular.api;
+import com.alibaba.fastjson.JSON;
import com.stylefeng.guns.modular.system.model.OrderPosition;
import com.stylefeng.guns.modular.system.service.IDriverService;
import com.stylefeng.guns.modular.system.service.INettyService;
@@ -77,13 +78,13 @@
*/
@ResponseBody
@PostMapping("/base/netty/deleteTask")
- public ResultUtil deleteTask(Integer orderId, Integer orderType){
+ public String deleteTask(Integer orderId, Integer orderType){
try {
pushUtil.removeTask(orderId, orderType);
- return ResultUtil.success();
+ return JSON.toJSONString(ResultUtil.success());
}catch (Exception e){
e.printStackTrace();
- return ResultUtil.runErr();
+ return JSON.toJSONString(ResultUtil.runErr());
}
}
--
Gitblit v1.7.1