From 8cb383dcbfd972de368cdb556eff4293d14cf33e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 26 八月 2019 15:19:13 +0800
Subject: [PATCH] Merge branch 'mater-1.6.0' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassAdminController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassAdminController.java
index 6ebb4f9..03e7ce1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassAdminController.java
@@ -52,8 +52,8 @@
* @param out
*/
@RequestMapping(value = "save")
- public void save(String callback, GoodsSubClass goodsSubClass, Long pid, Integer type, HttpServletRequest request,
- PrintWriter out) {
+ public void save(String callback, GoodsSubClass goodsSubClass, Long pid, Integer type, Long labelId,
+ HttpServletRequest request, PrintWriter out) {
if (goodsSubClass.getTaobaoCids() != null)
goodsSubClass.setTaobaoCids(goodsSubClass.getTaobaoCids().replace("锛�", ","));
@@ -62,9 +62,9 @@
if (request instanceof MultipartHttpServletRequest) {
MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;
goodsSubClassService.saveObject(fileRequest.getFile("file"), fileRequest.getFile("file2"),
- goodsSubClass, type, pid);
+ goodsSubClass, type, pid, labelId);
} else {
- goodsSubClassService.saveObject(null, null, goodsSubClass, type, pid);
+ goodsSubClassService.saveObject(null, null, goodsSubClass, type, pid, labelId);
}
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
--
Gitblit v1.8.0