Merge branch 'shichen0929' of shop/php into dev

app/common/repositories/user/UserRepository.php

@@ -2911,7 +2911,14 @@ class UserRepository extends BaseRepository
             //            $birth = strtotime(substr($certification["user_card"], 6, 8));
             $old_age = $this->getSex($certification["user_card"])?60:55;
             //            $age = $this->howOld($birth);
-            $age=$this->calculateAge($birth_data);
+
+
+            // 兼容港澳台证件号
+            if ($certification['card_type'] == 1){
+                $age=$this->calculateAge($birth_data);
+            }else{
+                $age=$this->calculateAge($certification['birthday']);
+            }
 
             if ($age < $old_age) {
                 //                $yes = $old_age - $age;