记得上下班打卡 | git大法好,push需谨慎

Commit b3f5d824 authored by 张国柄's avatar 张国柄

~opt;

parent 7337a6f1
...@@ -87,8 +87,8 @@ public class GoblinFrontController { ...@@ -87,8 +87,8 @@ public class GoblinFrontController {
@GetMapping("getGoodsDetail/scanner") @GetMapping("getGoodsDetail/scanner")
@ApiOperation(value = "获得商品详情/条形码识别", notes = "条码识别SKU时使用") @ApiOperation(value = "获得商品详情/条形码识别", notes = "条码识别SKU时使用")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "barCode", value = "SKU条码"), @ApiImplicitParam(paramType = "form", required = true, dataType = "String", name = "barCode", value = "SKU条码"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "marketId", value = "活动id"), @ApiImplicitParam(paramType = "form", required = true, dataType = "String", name = "marketId", value = "活动id"),
}) })
public ResponseDto<GoblinFrontGoodDetailVo> getGoodsDetailByScanner(@RequestParam String barCode, @RequestParam("marketId") String marketId) { public ResponseDto<GoblinFrontGoodDetailVo> getGoodsDetailByScanner(@RequestParam String barCode, @RequestParam("marketId") String marketId) {
String currentUid = CurrentUtil.getCurrentUid(); String currentUid = CurrentUtil.getCurrentUid();
......
...@@ -35,9 +35,9 @@ public class GoblinStoreMgtGoodsImportController { ...@@ -35,9 +35,9 @@ public class GoblinStoreMgtGoodsImportController {
@PostMapping("/upload") @PostMapping("/upload")
@ApiOperation(value = "批量导入数据", notes = "同一个店铺多次导入数据时间间隔最短30秒") @ApiOperation(value = "批量导入数据", notes = "同一个店铺多次导入数据时间间隔最短30秒")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(type = "form", required = true, dataType = "File", name = "file", value = "文件"), @ApiImplicitParam(paramType = "form", required = true, dataType = "file", name = "file", value = "文件"),
@ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "dataType", value = "导入数据类型[1-商品数据]", example = "1"), @ApiImplicitParam(paramType = "form", required = true, dataType = "int", name = "dataType", value = "导入数据类型[1-商品数据]", example = "1"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "storeId", value = "店铺ID"), @ApiImplicitParam(paramType = "form", required = true, dataType = "String", name = "storeId", value = "店铺ID"),
}) })
public ResponseDto<String> upload(@RequestParam MultipartFile file, @RequestParam int dataType, public ResponseDto<String> upload(@RequestParam MultipartFile file, @RequestParam int dataType,
@RequestParam @NotBlank(message = "店铺ID不能为空") String storeId) { @RequestParam @NotBlank(message = "店铺ID不能为空") String storeId) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment