Merge branch 'master' into ysx-供应商0.5-20220302

app/Http/Services/SupplierAuditService.php

@@ -112,6 +112,9 @@ class SupplierAuditService
             $lastUpdateUserId = $supplier['create_uid'];
         } else {
             $lastUpdateUserId = $log['admin_id'];
+            if ($lastUpdateUserId == 1000) {
+                return true;
+            }
         }
         //审批人只能审批自己的部下修改的供应商
         $departmentService = new DepartmentService();

app/Http/Services/SupplierService.php

@@ -386,6 +386,8 @@ class SupplierService
                 $contact = [
                     'supplier_id' => $supplierId,
                     'can_check_uids' => $channelUid,
+                    'add_time'=> time(),
+                    'admin_id' => request()->user->userId,
                 ];
                 $contactResult = $contactModel->insert($contact);
             }

app/Model/IntracodeModel.php

@@ -33,7 +33,7 @@ class IntracodeModel extends Model
                     }
                 }
                 $redis->set('EncodedList_supplier_' . $includeResigned, json_encode($codeList));
-                $redis->expire('EncodedList_supplier_' . $includeResigned, 60 * 10);//缓存10分钟
+                $redis->expire('EncodedList_supplier_' . $includeResigned, 30);//缓存10分钟
             }
         }
         return $codeList;

public/images/icons8-file-100.png:Zone.Identifier

-[ZoneTransfer]
-ZoneId=3
-HostUrl=about:internet

resources/views/web/AddSupplierReceipt.blade.php

@@ -27,7 +27,7 @@
                 <label class="layui-form-label"><span class="require">*</span>开户名称 : </label>
                 <div class="layui-input-block block-42">
                     <input type="text" name="bank_name" id="bank_name"
-                           placeholder="请输入开户名称,比如建设银行" class="layui-input"
+                           placeholder="请输入开户名称，比如深圳市猎芯科技有限公司" class="layui-input"
                            value="{{$receipt['bank_name'] or ''}}">
                 </div>
             </div>