Merge branch 'dev' into test

# Conflicts:
#	domain/src/main/java/com/hikcreate/edl/pub/web/mobile/domain/impl/BindServiceImpl.java

domain/src/main/java/com/hikcreate/edl/pub/web/mobile/domain/impl/BindServiceImpl.java

@@ -79,8 +79,10 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> i
         boundQuery.eq("status", "1");
         List<ParkBindInfo> list = mapper.selectList(boundQuery);
         if (list != null && list.size() >= 3) {
-            return ResponseGenerator.fail(StatusCode.BUSINESS_ERROR);
+            return ResponseGenerator.fail(StatusCode.BUSINESS_ERROR,"同一用户下,最多绑定3辆车");
         }
+
+        //规则:一个电话号码只能对应一个客户
         if (list != null && list.size() > 0) {
             boolean equals = list.get(0).getPhone().equals(info.getPhone());
             if (!equals) {

infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/data/cache/BindCache.java

@@ -75,4 +75,6 @@ public class BindCache {
         bindInfo.setUnbindTime(new Date());
         return mapper.unbind(bindInfo) > 0;
     }
+
+
 }