解决冲突

video/app/src/main/java/com/mints/wisdomclean/mvp/model/HotStyleListBean.kt

@@ -5,9 +5,11 @@ import android.os.Parcelable
 import kotlinx.android.parcel.Parcelize
 import java.io.Serializable
 
+@SuppressLint("ParcelCreator")
+@Parcelize
 data class HotStyleListBean(
     val list: List<HotStyleBean>
-) : Serializable
+) : Parcelable
 
 @SuppressLint("ParcelCreator")
 @Parcelize
@@ -39,7 +41,9 @@ data class HotStyleTypesBean(
     var imageCount: Int = -1,
 ) : Parcelable
 
+@SuppressLint("ParcelCreator")
+@Parcelize
 data class HotStyleMsgBean(
     val images: List<HotStyleBean>,
     val types: List<HotStyleTypesBean>
-) : Serializable
\ No newline at end of file
+) : Parcelable

video/gradle.properties

@@ -40,7 +40,11 @@ WEIXIN_APP_ID =wx6830d86ba20be254
 WEIXIN_APP_SECRET =91f91c0721bd989cf8b9c9b8dc8a5e9c
 
 #umeng
+<<<<<<< Updated upstream
 RELEASE_UMENG_KEY=64a67d4fa1a164591b44f0e8
+=======
+RELEASE_UMENG_KEY=63c0fd97d64e68613917170f
+>>>>>>> Stashed changes
 
 GROMORE_APP_ID="5404192"
 GROMORE_SPLASH_CODE="102371299"