Merge remote-tracking branch 'origin/master'

ldt-core/src/main/java/org/springblade/ldt/goods/controller/GoodsPropertyController.java

@@ -116,6 +116,16 @@ public class GoodsPropertyController extends BladeController {
 		return R.status(goodsPropertyService.updateById(goodsProperty));
 	}
 
+	/**
+	 * 批量修改
+	 */
+	@PostMapping("/updateBatch")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入goodsProperty")
+	public R updateBatch(@Valid @RequestBody List<GoodsProperty> goodsPropertyList) {
+		return R.status(goodsPropertyService.updateBatchById(goodsPropertyList));
+	}
+
 	/**
 	 * 新增或修改
 	 */