Merge remote-tracking branch 'origin/master' into 4.2.x

This commit is contained in:
William Cheng
2019-10-04 15:02:58 +08:00
1246 changed files with 29609 additions and 16734 deletions

View File

@@ -224,7 +224,7 @@ class StoreController extends Controller
$asserts[] = new Assert\NotNull();
$asserts[] = new Assert\Type("int");
$asserts[] = new Assert\GreaterThanOrEqual(1);
$asserts[] = new Assert\LessThanOrEqual(1);
$asserts[] = new Assert\LessThanOrEqual(5);
$response = $this->validate($orderId, $asserts);
if ($response instanceof Response) {
return $response;