Merge remote-tracking branch 'origin/master'

Lighting/Class/ClientViewController.m

@@ -358,10 +358,10 @@
     
     //客户信息类
     TOConsumerEntity *customerEntity = [[TOConsumerEntity alloc]init];
-    customerEntity.createName = self.customerNameField.text;
+    customerEntity.createName = [Shoppersmanager manager].Shoppers.employee.realName;
     customerEntity.mobile = self.phoneNumberField.text;
     customerEntity.address = self.customerAddress.text;
-    customerEntity.name = self.companyNameField.text;
+    customerEntity.name = self.customerNameField.text;
     //修改
     if (isChange) {
        customerEntity.fid = [Customermanager manager].customerID;

Lighting/Class/Tabbar/Toolview.m

@@ -82,8 +82,8 @@
     [self addSubview:button];
     
     //按钮
-    NSString *userName = [Shoppersmanager manager].Shoppers.employee.userName?[Shoppersmanager manager].Shoppers.employee.userName:@"某某用户";
-    NSArray *titleArray = [NSArray arrayWithObjects:@"功能菜单",userName,@"我的客户",@"购物车", nil];
+    NSString *realName = [Shoppersmanager manager].Shoppers.employee.realName?[Shoppersmanager manager].Shoppers.employee.realName:@"服务导购";
+    NSArray *titleArray = [NSArray arrayWithObjects:@"功能菜单",realName,@"我的客户",@"购物车", nil];
     //图片
     NSArray *imageArray = [NSArray arrayWithObjects:@"dial",@"Cog",@"data",@"ablum", nil];
     for (int i=1; i<5; i++) {

Lighting/Lighting.xcodeproj/project.pbxproj

@@ -1605,7 +1605,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "f89bebf5-81e2-4c61-9052-8c7bb0f9ddd6";
+				PROVISIONING_PROFILE = "e9bd3600-5e9c-4cd0-a0d5-b7d8b0882ca8";
 				STRIP_PNG_TEXT = NO;
 				USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";
 			};
@@ -1657,7 +1657,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "f89bebf5-81e2-4c61-9052-8c7bb0f9ddd6";
+				PROVISIONING_PROFILE = "e9bd3600-5e9c-4cd0-a0d5-b7d8b0882ca8";
 				STRIP_PNG_TEXT = NO;
 				USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";
 			};