Merge remote-tracking branch 'origin/dev' into dev

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/controller/PriceItemController.java

@@ -176,7 +176,7 @@ public class PriceItemController extends BladeController {
 	@PostMapping("import-price")
 	@ApiOperationSupport(order = 12)
 	@ApiOperation(value = "导入价格", notes = "传入excel")
-	public R importUser(MultipartFile file) {
+	public R importUser(@RequestParam("file") MultipartFile file) {
 		Integer isCovered = 0;
 		PriceImport priceImport = new PriceImport(priceItemService, isCovered == 1);
 		ExcelUtil.save(file, priceImport, PriceItemExcel.class);

blade-service/blade-stock/src/main/java/org/springblade/stock/controller/StockGoodsController.java

@@ -318,7 +318,7 @@ public class StockGoodsController extends BladeController {
 	@PostMapping("/import-price")
 	@ApiOperationSupport(order = 12)
 	@ApiOperation(value = "导入库存", notes = "传入excel")
-	public R importUser(MultipartFile file) {
+	public R importUser(@RequestParam("file") MultipartFile file) {
 		List<StockGoodsExcel> excelList = ExcelUtil.read(file, StockGoodsExcel.class);
 		if (CollectionUtils.isEmpty(excelList)){
 			throw new SecurityException("数据不能为空");