Merge branch 'version1.5' of ssh://192.168.10.210:10022/wugg/stock into version1.5

app/admin/controller/Customar.php

@@ -27,7 +27,7 @@ class Customar extends BaseController
         if ($companyName == "") {
             return error_show(1002, "参数companyName不能为空");
         }
-        $rename = Db::name('customer_info')->where(['is_del' => 0, 'name' => $companyName])->find();
+        $rename = Db::name('customer_info')->where(['is_del' => 0, 'companyName' => $companyName])->find();
         if (!empty($rename)) {
             return error_show(1002, "公司名称已存在");
         }