Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/abutment/config/common.php

@@ -1,9 +0,0 @@
-<?php
-
-return [
-
-    //账号默认密码
-    'default_password' => 'dingding123',
-
-
-];

app/abutment/logic/Account.php

@@ -236,7 +236,7 @@ class Account
             if (!$res->isEmpty()) throw new Exception('该手机号已存在');
 
             //新增账号
-            $password = get_encryption_password(Config::get('common.default_password'));
+            $password = get_encryption_password(Config::get('app.default_password'));
             $uid = $db->insertGetId([
                 'nickname' => $param['nickname'],//姓名
                 'mobile' => $param['mobile'],//手机号

app/admin/controller/Suppler.php

@@ -291,7 +291,7 @@ class Suppler extends Base
 
         //获取开通账号的供应商
         $account = checkHasAccountBySupplierNos(array_column($list,'code'));
-        
+
         foreach ($list as &$value) {
             $value['contactor'] = isset($all_codes[$value['code']]['contactor']) ? $all_codes[$value['code']]['contactor'] : '';
             $value['mobile'] = isset($all_codes[$value['code']]['mobile']) ? $all_codes[$value['code']]['mobile'] : '';