Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/izouma/dingdong/web/merchant/GoodsSpecificationController.java

src/main/java/com/izouma/dingdong/web/merchant/GoodsSpecificationController.java

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.sql.Wrapper;
 import java.util.List;
 
 @RestController
@@ -84,7 +85,7 @@ public class GoodsSpecificationController extends BaseController {
 
     @PostMapping("/saveAll")
     @ApiOperation("批量保存规格")
-    public List<GoodsSpecification> saveAll(@RequestBody List<GoodsSpecification> spec) {
+    public List<GoodsSpecification> saveAll(List<GoodsSpecification> spec) {
         return goodsSpecificationService.saveAll(spec);
     }
 }