Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/C/YHCompanySelectViewController.swift

@@ -54,7 +54,7 @@ class YHCompanySelectViewController: YHBaseViewController {
         sureButton = {
             let button = UIButton(type: .custom)
             button.backgroundColor =  UIColor(hex:0x2274ee)
-            button.titleLabel?.font = kBoldFont(size: 16)
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
             button.contentHorizontalAlignment = .center
             button.setTitle("保存", for: .normal)
             button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
@@ -164,8 +164,8 @@ class YHCompanyTableViewCell: UITableViewCell {
     func setupUI() {
         titleLabel = {
             let label = UILabel()
-            label.font = kFont(size: 13)
-            label.textColor = UIColor(hex:0x222222)
+            label.font = UIFont.PFSC_R(ofSize: 13)
+            label.textColor = UIColor.mainTextColor
             return label
         }()
         contentView.addSubview(titleLabel)