Merge branch 'feature/inv' into develop

app/admin/controller/InvItemController.php

@@ -4,6 +4,7 @@ namespace app\admin\controller;
 use app\common\controller\BaseController;
 use app\common\model\Corp;
 use app\common\model\User;
+use app\common\service\OssService;
 use app\common\traits\crud\CrudControllerTrait;
 use app\common\service\InvItemService;
 use support\Request;
@@ -50,6 +51,8 @@ class InvItemController extends BaseController
              $data['company_name'] = Corp::where('id', $data['company_id'])->value('name');
          if (isset($data['manage_user_id']))
              $data['manage_user_name'] = User::where('id', $data['manage_user_id'])->value('name');
+         if (isset($data['qr_code']))
+             $data['qr_code_pull'] = (new OssService)->generatePrivateUrl($data['qr_code']);;
          return $data;
      }
 
@@ -121,8 +124,8 @@ class InvItemController extends BaseController
             }
 
             // 清空物品记录中的二维码字段
-            $item->qr_code = null;
-            $item->qr_code_url = null;
+            $item->qr_code = '';
+            $item->qr_code_url = '';
             $item->save();
 
             return $this->success([], '二维码删除成功');