From 876efb176417c8c97c7adc087171d2e20dff765e Mon Sep 17 00:00:00 2001
From: zcx <1078327420@qq.com>
Date: Sat, 16 Dec 2023 08:08:24 +0800
Subject: [PATCH] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit 781d628f8fdf9aade07728a2f2a0abb4f011e4f6
Author: zcx <1078327420@qq.com>
Date:   Sat Dec 16 08:03:54 2023 +0800

    标注

commit fe88fa870697ae46b181cf323742ac1d9116e4fc
Merge: 40a106a 50cfb15
Author: zcx <1078327420@qq.com>
Date:   Sat Dec 16 08:02:00 2023 +0800

    Merge branch 'main' of https://bdgit.educoder.net/pq3fnjual/Minotes into 曾晨曦_branch

commit 40a106ab72efcc2e041837d6cf9d88866a3c7d10
Author: zcx <1078327420@qq.com>
Date:   Thu Dec 14 18:50:49 2023 +0800

    1

commit a6bf1d5701a0968cc9120efe48e7fe5c2f2bcbb8
Author: zcx <1078327420@qq.com>
Date:   Thu Dec 14 18:36:19 2023 +0800

    UI包一部分

commit a99095dbf958cb855d36fbfb2d0a55833c624fa1
Author: zcx <1078327420@qq.com>
Date:   Thu Dec 14 18:25:02 2023 +0800

    data包

commit b7353d6c78d87569f08313df8fd5ec7341d232e0
Merge: b5f43d0 0b1994e
Author: zcx <1078327420@qq.com>
Date:   Thu Dec 14 18:22:15 2023 +0800

    Merge branch 'main' of https://bdgit.educoder.net/pq3fnjual/Minotes into 曾晨曦_branch

    # Conflicts:
    #	.gitignore
    #	doc/实践模板-开源软件泛读、标注和维护报告文档.docx

commit b5f43d07211990d77bd2858abbe5d0509aac389d
Author: zcx <1078327420@qq.com>
Date:   Sun Dec 10 10:38:18 2023 +0800

    1

commit a8c79ccdc54d8bafb9a3036f8d759924879e2a11
Author: zcx <1078327420@qq.com>
Date:   Mon Dec 4 21:09:41 2023 +0800

    。
---
 src/Notes-master/src/net/micode/notes/data/Contact.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Notes-master/src/net/micode/notes/data/Contact.java b/src/Notes-master/src/net/micode/notes/data/Contact.java
index 493f40d..f2e5b72 100644
--- a/src/Notes-master/src/net/micode/notes/data/Contact.java
+++ b/src/Notes-master/src/net/micode/notes/data/Contact.java
@@ -69,14 +69,14 @@ public class Contact { //
                 String name = cursor.getString(0);
                 sContactCache.put(phoneNumber, name);
                 return name;
-            // �쳣
+            // �쳣����
             } catch (IndexOutOfBoundsException e) {
                 Log.e(TAG, " Cursor get string error " + e.toString());
                 return null;
             } finally {
                 cursor.close();
             }
-            // δ�ҵ������Ϣ
+            // δ�ҵ������Ϣ����
         } else {
             Log.d(TAG, "No contact matched with number:" + phoneNumber);
             return null;