添加百度的混淆文件

 Conflicts:
	library_base/version.properties

 Conflicts:
	.idea/compiler.xml
	.idea/runConfigurations.xml
	app/src/main/res/mipmap-xxhdpi/icon_gcoding.png
	library_base/version.properties

 Conflicts:
	library_base/version.properties

 Conflicts:
	library_base/version.properties

 Conflicts:
	shareSdkLib/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
	shareSdkLib/build/intermediates/incremental/mergeDebugShaders/merger.xml
	shareSdkLib/build/intermediates/incremental/packageDebugAssets/merger.xml
	shareSdkLib/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
	shareSdkLib/build/intermediates/incremental/packageDebugResources/merger.xml
	shareSdkLib/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
	shareSdkLib/build/outputs/logs/manifest-merger-debug-report.txt

2.免费专区的页面和功能已完成
3.精选体验的页面和功能已完成

 Conflicts:
	library_base/version.properties

 Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/mints/street/splash/SplashActivity.kt
	app/src/main/res/layout/activity_splash.xml
	library_base/version.properties

2.免费专区的页面和功能已完成
3.精选体验的页面和功能已完成