Merge branch 'liuzj-1000959-dev' into test

# Conflicts:
#	modules/Channel/Http/Controllers/PayTemplateController.php

modules/Channel/Http/Controllers/PayTemplateController.php

@@ -14,6 +14,7 @@ use Modules\Channel\Services\User\UserService;
 
 class PayTemplateController extends CatchController
 {
+    use ValidatesRequests;
     public function __construct(protected readonly PayTemplate $payTemplate,protected readonly PayTemplateItem $payTemplateItem,protected readonly PayProduct $payProduct)
     {
 

modules/Tuiguang/Http/Controllers/PromotionController.php

@@ -14,7 +14,6 @@ class PromotionController extends CatchController
 {
     use UserTrait;
     use ValidatesRequests;
-
     public function list(Request $request) {
         $callbackTypeMap = [
             '0' => '无',