解决冲突

.idea/.gitignore

@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml

.idea/MiNotes.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/MiNotes.iml" filepath="$PROJECT_DIR$/.idea/MiNotes.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

src/Notes-master1/app/src/main/java/net/micode/notes/data/Contact.java

@@ -27,7 +27,7 @@ import java.util.HashMap;
 /**
   * @Package:        net.micode.notes.data
   * @ClassName:      Contact
-  * @Description:    java类作用描述 
+  * @Description:
   * @Author:         WUSHUXIAN
   * @CreateDate:     2023/12/20 23:26
   * @Version:        1.0
@@ -42,8 +42,17 @@ public class Contact {
             + "(SELECT raw_contact_id "
             + " FROM phone_lookup"
             + " WHERE min_match = '+')";
-
+     /**
+      * @method          getContact
+      * @description:
+      * @date:           2023/12/21 19:18
+      * @author:         WuShuxian
+      * @param:          context
+      * @param:          phoneNumber
+      * @return:         String
+      */
     public static String getContact(Context context, String phoneNumber) {
+        //
         if(sContactCache == null) {
             sContactCache = new HashMap<String, String>();
         }