Merge branch 'master' of http://git.gelifood.com/ljy/gelibusinessplatform

GeliBusinessPlatform/ViewController/个人中心/PersonCenterViewController.swift

@@ -42,7 +42,7 @@ class PersonCenterViewController: BaseViewController,UITableViewDelegate,UITable
         super.viewDidLoad()
         topImgBg.snp.makeConstraints { (make) in
             make.top.left.right.equalTo(0)
-            make.height.equalTo(227*glscale)
+            make.height.equalTo(227)
         }
         topBgImg.snp.makeConstraints { (make) in
             make.bottom.equalTo(topImgBg.snp_top)
@@ -106,7 +106,7 @@ class PersonCenterViewController: BaseViewController,UITableViewDelegate,UITable
     }
     
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return 50*glscale
+        return 50
     }
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return listArray.count

GeliBusinessPlatform/ViewController/个人中心/PersonCenterViewController.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="PersonCenterViewController" customModule="GeliBusinessPlatform" customModuleProvider="target">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="PersonCenterViewController" customModule="TestClass" customModuleProvider="target">
             <connections>
                 <outlet property="iconImg" destination="DwS-q4-jGe" id="6he-Rl-qwv"/>
                 <outlet property="listView" destination="5jU-Ew-dGr" id="xBV-SK-mS7"/>
@@ -132,7 +132,7 @@
                     <constraints>
                         <constraint firstAttribute="height" constant="150" id="sgr-YH-MQe">
                             <userDefinedRuntimeAttributes>
-                                <userDefinedRuntimeAttribute type="boolean" keyPath="isAdaptateScreen" value="YES"/>
+                                <userDefinedRuntimeAttribute type="boolean" keyPath="isAdaptateScreen" value="NO"/>
                             </userDefinedRuntimeAttributes>
                         </constraint>
                     </constraints>