Commit c492c075 authored by pete谢兆麟's avatar pete谢兆麟

device

parent 7e7d5875
...@@ -27,6 +27,7 @@ target 'galaxy' do ...@@ -27,6 +27,7 @@ target 'galaxy' do
pod 'SwifterSwift','6.0.0' pod 'SwifterSwift','6.0.0'
#下拉刷新、上拉更多 #下拉刷新、上拉更多
pod 'ESPullToRefresh',"2.9.3" pod 'ESPullToRefresh',"2.9.3"
<<<<<<< Updated upstream
#Toast #Toast
pod 'Toast-Swift', '5.0.1' pod 'Toast-Swift', '5.0.1'
#富文本 UILabel #富文本 UILabel
...@@ -53,6 +54,11 @@ target 'galaxy' do ...@@ -53,6 +54,11 @@ target 'galaxy' do
=======
#设备框架
pod 'DeviceKit', '~> 5.1'
>>>>>>> Stashed changes
# #数据模型转换 # #数据模型转换
pod 'HandyJSON','5.0.2' pod 'HandyJSON','5.0.2'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment