Merge branch 'ControlChanges'

* ControlChanges:
  bug
  bug修改
  控件优化了

# Conflicts:
#	HappyWork/HappyWork.xcworkspace/xcuserdata/zhangxiaoguang.xcuserdatad/UserInterfaceState.xcuserstate
#	HappyWork/HappyWork/Class/DemandHall/ViewController/DemanHallViewController.m

HappyWork/HappyWork/Class/DemandHall/ViewController/DemanHallViewController.m

@@ -62,7 +62,11 @@ PageListTableViewDelegate
 }
 - (void)test{
     
+    ///<<<<< HEAD
     NSLog(@"主干bug修改了");
+//=======
+//    NSLog(@"分支测试");
+//>>>>>>> ControlChanges
 }
 #pragma mark - event response 通知
 /* 登录刷新 */