Merge branch 'master' into feature/dev-frontend-ui

common/helpers/user/Info.php

@@ -616,7 +616,7 @@ class Info {
                 $password = $userName;
                 break;
             default:
-                $password = '123456';
+                $password = '111111';
         }
         return $password;
     }
@@ -720,4 +720,4 @@ class Info {
     public static function getBaBaseUserByUserName($username) {
         return BaUser::findOneAsArray('USER_NAME=:USER_NAME', [':USER_NAME' => $username]);
     }
-}
+}

common/models/forms/AdminAddUserForm.php

@@ -224,7 +224,6 @@ class AdminAddUserForm extends Model {
             $user->REAL_NAME = $this->realName;
 //            $user->ID_CARD = $this->idCard;
             $user->MOBILE = $this->mobile;
-            $user->ADDRESS = 'nothing';//无
             $user->ADDRESS = $this->address ? $this->address : 'nothing';//无
             $user->OPEN_BANK = $this->openBank;
             $user->BANK_ADDRESS = $this->bankAddress;