Merge branch 'test' into dev

@@ -146,8 +146,8 @@ func (userBase *UserBase) CheckAccountPassword(account, password string) error {
 // account 账号 (手机号)
 // account 账号 (手机号)
 // password 密码（sha1）
 // password 密码（sha1）
 func (userBase *UserBase) ResetPassword(account, password string) error {
 func (userBase *UserBase) ResetPassword(account, password string) error {
-	if userBase.Status != int(UserStatusEnable) {
-		return fmt.Errorf("该用户不存在")
+	if userBase.Status == int(UserStatusDestroy) {
+		return fmt.Errorf("该用户已注销")
 	}
 	}
 	if !strings.EqualFold(account, userBase.Account) {
 	if !strings.EqualFold(account, userBase.Account) {
 		return fmt.Errorf("该用户不存在")
 		return fmt.Errorf("该用户不存在")

@@ -2002,5 +2002,49 @@
     "name": "省直辖县级行政区划",
     "name": "省直辖县级行政区划",
     "province": "42",
     "province": "42",
     "city": "90"
     "city": "90"
+  },
+
+
+  {
+    "code": "110000",
+    "name": "北京市",
+    "province": "11",
+    "city": "01"
+  },
+  {
+    "code": "120000",
+    "name": "天津市",
+    "province": "12",
+    "city": "01"
+  },
+  {
+    "code": "310000",
+    "name": "上海市",
+    "province": "31",
+    "city": "01"
+  },
+  {
+    "code": "500000",
+    "name": "重庆市",
+    "province": "50",
+    "city": "01"
+  },
+  {
+    "code": "810000",
+    "name": "香港特别行政区",
+    "province": "81",
+    "city": "01"
+  },
+  {
+    "code": "820000",
+    "name": "澳门特别行政区",
+    "province": "82",
+    "city": "01"
+  },
+  {
+    "code": "710000",
+    "name": "中国台湾",
+    "province": "71",
+    "city": "01"
   }
   }
 ]
 ]

 [
 [
   {
   {
     "code": "110000",
     "code": "110000",
-    "name": "北京市",
+    "name": "北京",
     "province": "11"
     "province": "11"
   },
   },
   {
   {
     "code": "120000",
     "code": "120000",
-    "name": "天津市",
+    "name": "天津",
     "province": "12"
     "province": "12"
   },
   },
   {
   {
@@ -41,7 +41,7 @@
   },
   },
   {
   {
     "code": "310000",
     "code": "310000",
-    "name": "上海市",
+    "name": "上海",
     "province": "31"
     "province": "31"
   },
   },
   {
   {
@@ -106,7 +106,7 @@
   },
   },
   {
   {
     "code": "500000",
     "code": "500000",
-    "name": "重庆市",
+    "name": "重庆",
     "province": "50"
     "province": "50"
   },
   },
   {
   {
@@ -156,17 +156,17 @@
   },
   },
   {
   {
     "code": "710000",
     "code": "710000",
-    "name": "台湾省",
+    "name": "台湾",
     "province": "71"
     "province": "71"
   },
   },
   {
   {
     "code": "810000",
     "code": "810000",
-    "name": "香港特别行政区",
+    "name": "香港",
     "province": "81"
     "province": "81"
   },
   },
   {
   {
     "code": "820000",
     "code": "820000",
-    "name": "澳门特别行政区",
+    "name": "澳门",
     "province": "82"
     "province": "82"
   }
   }
 ]
 ]