From 73a3d86a47d8da711b609cd224c63526f7d00f9b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 22 七月 2020 12:49:06 +0800
Subject: [PATCH] 比价相关的bug修复

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassLabelAdminController.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassLabelAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassLabelAdminController.java
index 9eebc47..0c63e4a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassLabelAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassLabelAdminController.java
@@ -8,6 +8,7 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import com.yeshi.fanli.entity.accept.AdminAcceptData;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.yeshi.utils.JsonUtil;
@@ -18,7 +19,7 @@
 import com.yeshi.fanli.entity.bus.clazz.GoodsSubClassLabel;
 import com.yeshi.fanli.exception.goods.GoodsClassException;
 import com.yeshi.fanli.service.inter.clazz.GoodsSubClassLabelService;
-import com.yeshi.fanli.tag.PageEntity;
+import com.yeshi.common.entity.PageEntity;
 import com.yeshi.fanli.util.StringUtil;
 
 import net.sf.json.JSONObject;
@@ -41,8 +42,8 @@
 	 * @param out
 	 */
 	@RequestMapping(value = "labelList")
-	public void labelList(String callback, Long classId, int pageIndex, int pageSize, HttpServletRequest request,
-			PrintWriter out) {
+	public void labelList(AdminAcceptData acceptData, String callback, Long classId, int pageIndex, int pageSize, HttpServletRequest request,
+						  PrintWriter out) {
 
 		if (classId != null && classId == 0)
 			classId = null;
@@ -66,7 +67,7 @@
 	 * @param out
 	 */
 	@RequestMapping(value = "saveLabel")
-	public void save(String callback, GoodsSubClassLabel label, HttpServletRequest request, PrintWriter out) {
+	public void save(AdminAcceptData acceptData,String callback, GoodsSubClassLabel label, HttpServletRequest request, PrintWriter out) {
 		if (StringUtil.isNullOrEmpty(label.getName()) || label.getGoodsClass() == null || label.getOrderBy() == null) {
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏁版嵁涓嶅畬鏁�"));
 			return;
@@ -106,7 +107,7 @@
 	 * @param out
 	 */
 	@RequestMapping(value = "deleteLabelBatch")
-	public void deleteBatch(String callback, String ids, PrintWriter out) {
+	public void deleteBatch(AdminAcceptData acceptData,String callback, String ids, PrintWriter out) {
 		Gson gson = new Gson();
 		try {
 			List<String> recordIds = gson.fromJson(ids, new TypeToken<ArrayList<String>>() {

--
Gitblit v1.8.0