From 6dfb4599cee5c19f4d1c5cc344a4f84de1c1633c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 16 十二月 2019 15:26:57 +0800
Subject: [PATCH] 冲突信息
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/FloatADAdminController.java | 23 ++---------------------
1 files changed, 2 insertions(+), 21 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/FloatADAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/FloatADAdminController.java
index 47c2936..bf5f7fd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/FloatADAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/FloatADAdminController.java
@@ -16,7 +16,7 @@
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.yeshi.fanli.entity.bus.homemodule.FloatAD;
-import com.yeshi.fanli.exception.FloatADException;
+import com.yeshi.fanli.exception.homemodule.FloatADException;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.homemodule.FloatADService;
import com.yeshi.fanli.tag.PageEntity;
@@ -62,26 +62,7 @@
}
}
-// /**
-// * 淇濆瓨淇℃伅
-// *
-// * @param callback
-// * @param special
-// * @param out
-// */
-// @RequestMapping(value = "save")
-// public void save(String callback, @RequestParam("file") CommonsMultipartFile[] file, FloatAD floatAD,
-// String jumpType, PrintWriter out) {
-// try {
-// floatADervice.saveObject(file, floatAD, jumpType);
-// JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
-// } catch (FloatADException e) {
-// JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
-// } catch (Exception e) {
-// JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
-// e.printStackTrace();
-// }
-// }
+
/**
* 淇敼鎺掑簭
--
Gitblit v1.8.0