Merge branch 'master' of http://121.42.32.57/root/vanke into master_01

Conflicts:
	vanke/Info.plist

vanke/Info.plist

@@ -21,7 +21,11 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
+<<<<<<< HEAD
 	<string>1.0.6</string>
+=======
+	<string>1.0.8</string>
+>>>>>>> a5fbccc597e57fff22534cbca9b672a3fa39d8b8
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

vanke/controller/VankeSettlementListAPI.m

@@ -37,8 +37,10 @@
         }
         
         if ([[VankeCommonModel sharedInstance] curUserIsTenant]) {
-            User *curUser = [[VankeCommonModel sharedInstance] currentUser];
-            request.PARAM(@"tenantEquals", curUser.code);
+            LoginResponseData *loginData = [[VankeCommonModel sharedInstance] getLoginInfo];
+            if (nil != loginData.tenant) {
+                request.PARAM(@"tenantEquals", loginData.tenant.uuid);
+            }
         }
         
         request.TIMEOUT(10);

vanke/controller/VankeUserLoginAPI.h

@@ -23,6 +23,18 @@
 
 @end
 
+/** uuid code name */
+@interface UCN: BeeActiveObject
+
+// 标识
+@property (nonatomic, strong) NSString *uuid;
+// 代码
+@property (nonatomic, strong) NSString *code;
+// 名称
+@property (nonatomic, strong) NSString *name;
+
+@end
+
 /** 用户 */
 @interface User: BeeActiveObject
 
@@ -96,6 +108,9 @@ extern NSString *const USER_POSITION_TENANT;     // 用户职位: 商户用户
 // 职位
 @property (nonatomic, strong) NSString *position;
 
+// 商铺
+@property (nonatomic, strong) UCN *tenant;
+
 
 -(User*) getUser;
 -(Enterpirse*) getEnterprise;

vanke/controller/VankeUserLoginAPI.m

@@ -60,6 +60,12 @@
 
 @end
 
+#pragma mark UCN
+@implementation UCN
+@synthesize uuid;
+@synthesize code;
+@synthesize name;
+@end
 
 #pragma mark User
 @implementation User
@@ -112,6 +118,7 @@ NSString *const USER_POSITION_TENANT = @"tenant";     // 用户职位: 商户用
 @synthesize authenticode;
 @synthesize authorizedOrgs;
 @synthesize position;
+@synthesize tenant;
 
 CONVERT_PROPERTY_CLASS(authorizedOrgs, AuthorizedOrg)