Merge branch 'mini' into test

modules/Manage/Http/Controllers/MiniprogramController.php

@@ -88,6 +88,7 @@ class MiniprogramController extends CatchController
     {
         $validate_result = $request->validated();
         $validate_result['remark'] = $request->post('remark','') ?? '';
+        $validate_result['pay_merchant_id'] = $request->post('pay_merchant_id',0);
         if (getProp($validate_result,'pay_merchant_id',0)){
             $info = DB::table('pay_merchants')->where('id',$validate_result['pay_merchant_id'])->first();
             if (empty($info)){
@@ -109,7 +110,7 @@ class MiniprogramController extends CatchController
             $validate_result['pay_merchant_id'] = 0;
             $validate_result['pay_merchant_info'] = [];
         }
-
+        
         return $this->miniprogram->create($validate_result)->toArray();
 
     }