Merge branch 'master' into dev

app-hd/controllers/GhsController.php

@@ -436,7 +436,7 @@ class GhsController extends BaseController
         if (empty($custom)) {
             util::fail('没有找到客户');
         }
-        if ($custom->black == 2) {
+        if ($custom->black == 1) {
             //没有列入黑名单的，增加访客记录
             StatVisitClass::addGhsCustomVisit($info, $custom);
         }