Merge branch 'qa_hengyang_base' into feature/feature_hengyang_base

# Conflicts:
#	.idea/runConfigurations.xml
This commit is contained in:
董宏宇
2021-07-26 11:08:53 +08:00
48 changed files with 984 additions and 607 deletions

View File

@@ -3,7 +3,6 @@
<component name="RunConfigurationProducerService">
<option name="ignoredProducers">
<set>
<option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
<option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />