解决冲突，重新podfile.lock文件

yinmeng-ios/Podfile

@@ -14,7 +14,7 @@ target 'yinmeng-ios' do
   pod 'MBProgressHUD'
   pod 'ReactiveObjC'
   pod 'FFPopup'
-pod 'TZImagePickerController'
+  pod 'TZImagePickerController'
   #易盾  本机一键登录
   pod 'NTESQuickPass'
   #模型转化
@@ -41,7 +41,7 @@ pod 'TZImagePickerController'
   #pop动画
   pod 'pop'
   pod 'SVGAPlayer'
-#, '~> 2.3'
+
   #vap礼物动画
   pod 'QGVAPlayer'
   pod 'IQKeyboardManager', '~> 6.5.11'

yinmeng-ios/Podfile.lock

@@ -32,7 +32,7 @@ PODS:
   - NTESQuickPass (3.4.5):
     - NTESBaseComponent
   - pop (1.0.12)
-  - Protobuf (3.25.1)
+  - Protobuf (3.24.4)
   - QGVAPlayer (1.0.19)
   - Qiniu (8.7.0):
     - HappyDNS (~> 1.0.3)
@@ -140,7 +140,7 @@ SPEC CHECKSUMS:
   NTESBaseComponent: 7b310e7e80bb6c27183176188b98356d200dbbc5
   NTESQuickPass: 7baf2a68a091fd69dbf70b84ecdc4eb6aa7dd7ad
   pop: d582054913807fd11fd50bfe6a539d91c7e1a55a
-  Protobuf: d94761c33f1239c0a43a0817ca1a5f7f7c900241
+  Protobuf: 351e9022fe13a6e2af00e9aefc22077cb88520f8
   QGVAPlayer: a0bca68c9bd6f1c8de5ac2d10ddf98be6038cce9
   Qiniu: da7204f1bf7d0ce18f2b8c541c7fafb301aab624
   QY_NIM_iOS_SDK: 7fbf411c9c299f3b904fcc5b494542f41a11f70c
@@ -154,10 +154,6 @@ SPEC CHECKSUMS:
   TZImagePickerController: e9909edbadf7381140efc5b5c9f5bdbfd630f7d4
   YYText: 5c461d709e24d55a182d1441c41dc639a18a4849
 
-<<<<<<< HEAD
-PODFILE CHECKSUM: f9ef35aef9e79e966fc3b6d31c6ed45e438d6dc5
-=======
-PODFILE CHECKSUM: 2a4277ff265cc4f2794e24536deeb780e0a31077
->>>>>>> 8893d997cc5aab2625ed0025815e70488ab1d650
+PODFILE CHECKSUM: cc88fa05da662ee682fc0eeb502faab221faa032
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.14.2

yinmeng-ios/yinmeng-ios.xcodeproj/xcuserdata/googlehandbag.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>yinmeng-ios.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>29</integer>
+			<integer>30</integer>
 		</dict>
 	</dict>
 </dict>