Merge pull request '解决3 files found with path ‘META-INF/DEPENDENCIES’ ...' (#8 ) from second into main

Merge pull request '解决jar包冲突' (#7 ) from second into main
Merge pull request '解决switch语句报错Constant expression required' (#6 ) from second into main
2 changed files with 1 additions and 1 deletions
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
  <component name="GradleSettings">
    <option name="linkedExternalProjectsSettings">
      <GradleProjectSettings>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="ExternalStorageConfigurationManager" enabled="true" />
  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
Author	SHA1	Message	Date
pb7q4l69o	d976195929	Merge pull request '解决3 files found with path ‘META-INF/DEPENDENCIES’ ...' (#8 ) from second into main	3 months ago
pb7q4l69o	3b49d2410e	Merge pull request '解决jar包冲突' (#7 ) from second into main	3 months ago
pb7q4l69o	279547bd06	Merge pull request '解决switch语句报错Constant expression required' (#6 ) from second into main	3 months ago
pb7q4l69o	f8a49ee1e7	Merge pull request '改错：找不到符号 notification.setLatestEventInfo...' (#5 ) from second into main	3 months ago
pb7q4l69o	e9904d0e02	Merge pull request '导入依赖' (#4 ) from second into main	3 months ago
pb7q4l69o	c5b31fc8b7	Merge pull request 'test2' (#3 ) from second into main	3 months ago
pb7q4l69o	d7472bc61f	Merge pull request 'test1' (#2 ) from second into main	3 months ago