Merge branch 'develop-tx-618' into 'develop'

解决包含rightBarButton按钮的页面进入下一级页面再pop回来，rightBarButton出现偏移

See merge request !18

galaxy/Podfile

@@ -129,7 +129,7 @@ target 'galaxy' do
 #  #骨架图
 #  pod 'SkeletonView','1.30.4'
   #导航栏、手势
-  pod 'GKNavigationBarSwift','1.6.8'
+  pod 'GKNavigationBarSwift','1.6.9'
   #crash统计
   pod 'Bugly','2.6.1'
   #神策数据分析