Merge branch 'dev_xixijuchang_240103' of...

Merge branch 'dev_xixijuchang_240103' of http://gitlab.mints-id.com/android/android_vedio into dev_xixijuchang_240103

# Conflicts:
#	video/app/build.gradle

video/app/build.gradle

@@ -10,8 +10,13 @@ android {
         applicationId "com.duben.xixiplaylet"
         minSdkVersion rootProject.ext.androidMinSdkVersion
         targetSdkVersion rootProject.ext.androidTargetSdkVersion
+<<<<<<< HEAD
         versionCode 700
         versionName "7.0.0"
+=======
+        versionCode 600
+        versionName "6.0.0"
+>>>>>>> 32bc6216aa6dd2f5a13715c8e977c035d97c0380
         flavorDimensions "default"
 
         // dex突破65535的限制