Merge code

This commit is contained in:
2022-03-13 00:43:05 +08:00
parent 00bf1acdb8
commit f433da040c
16 changed files with 132 additions and 140 deletions

2
.idea/misc.xml generated
View File

@@ -23,7 +23,7 @@
</map>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">