Merge branch 'shichen0929' of shop/php into dev

app/controller/api/user/User.php

@@ -961,10 +961,10 @@ class User extends BaseController
             // 设置exitentrypermit_type
             $exType = '';
             if ($cardType == 2) {
-                $exType = 'tw_return_passport_front'; //台胞证
+                $exType = 'hk_mc_return_passport_front'; //返乡证
             }
             if ($cardType == 3) {
-                $exType = 'hk_mc_return_passport_front'; // 返乡证
+                $exType = 'tw_return_passport_front'; // 台胞证
             }
 
             if (empty($exType)) {