Merge branch 'dev' of http://rungit.jxdsy.cn:10000/sugar/zhupu into dev

application/admin/controller/family/Namecard.php

@@ -166,7 +166,7 @@ class Namecard extends Backend
                 $offset = 1;
             }
             $cards = [];
-            $data['type'] = 1;//二维码类型 1=认领
+            $data['type'] = 2;//二维码类型 2=认领
             $numLen = 12; //卡号编码位数
             $pwdLen = 7;//激活码位数
             $sNumArr = range(0, 9);