Merge branch 'master' of http://120.24.33.109:11081/hyzjshwo/mp_lanzu_cat

app/Admin/Extensions/OrderPrint.php

@@ -10,6 +10,7 @@ use App\Models\ImsCjdcOrderMain;
 use Dcat\Admin\Grid\RowAction;
 use Graze\GuzzleHttp\JsonRpc\Client;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
 
 class OrderPrint extends RowAction
 {
@@ -53,6 +54,7 @@ class OrderPrint extends RowAction
         //>>2.调用打印
         if ($result == 1) {
             $res = Rpc::doPrint($row->global_order_id);
+            Log::info("[rpc doPrint]:",['$res'=>$res]);
             $res = json_decode($res, true)['result'];
             $res = json_decode($res);
 

app/Models/Feprint.php

@@ -10,5 +10,5 @@ use Illuminate\Database\Eloquent\Model;
 class Feprint extends Model
 {
     use HasDateTimeFormatter;
-    protected $table = 'ims_cjdc_feprint';
+    protected $table = 'lanzu_feprint';
 }