From a2735382e853f89465e328dce2df9f3f465bcda9 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 20 九月 2023 17:19:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/company/src/main/java/com/doumee/api/business/GoodsController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/business/GoodsController.java b/server/company/src/main/java/com/doumee/api/business/GoodsController.java
index 835b91e..08ef511 100644
--- a/server/company/src/main/java/com/doumee/api/business/GoodsController.java
+++ b/server/company/src/main/java/com/doumee/api/business/GoodsController.java
@@ -54,7 +54,7 @@
@PreventRepeat
@ApiOperation("浼佷笟鏂板缓鍟嗗搧")
@PostMapping("/companyCreate")
-// @RequiresPermissions("business:goods:create")
+ @RequiresPermissions("business:goods:create")
public ApiResponse companyCreate(@RequestBody Goods goods) {
goodsService.companyCreate(goods);
cateParamSelectService.dealCateParamSelect();
@@ -66,9 +66,10 @@
@PostMapping("/createPlat")
@RequiresPermissions("business:goods:create")
public ApiResponse createPlat(@RequestBody GoodCreatePlatRequest param) {
+ goodsService.openSyncSwitch();
goodsService.createPlat(param);
cateParamSelectService.dealCateParamSelect();
- return ApiResponse.success("鎿嶄綔鎴愬姛");
+ return ApiResponse.success("鍚屾鎿嶄綔鎴愬姛锛岃绋嶅悗鍒锋柊鏌ョ湅鍟嗗搧鍚屾淇℃伅");
}
@ApiOperation("鏍规嵁ID鍒犻櫎")
@@ -139,7 +140,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "file", value = "file", required = true, paramType = "query", dataType = "file", dataTypeClass = File.class),
})
-// @RequiresPermissions("business:goods:create")
+ @RequiresPermissions("business:goods:create")
public ApiResponse<Integer> importExcel (@ApiParam(value = "file") MultipartFile file) {
Integer val = goodsService.importBatch(file);
cateParamSelectService.dealCateParamSelect();
@@ -161,7 +162,6 @@
public ApiResponse<String> batchUpdateDisableById(@RequestBody BatchDisableDTO batchDisableDTO) {
return ApiResponse.success(goodsService.batchUpdateDisableById(batchDisableDTO));
}
-
@ApiOperation("鍒楄〃 - H5")
@PostMapping("/list")
--
Gitblit v1.9.3