diff --git a/doc/小米便签开源代码泛读报告_202212809017_于昊正.docx b/doc/小米便签开源代码泛读报告_202212809017_于昊正.docx
new file mode 100644
index 0000000..0875d40
Binary files /dev/null and b/doc/小米便签开源代码泛读报告_202212809017_于昊正.docx differ
diff --git a/src/model/Note.java b/src/Note.java
similarity index 100%
rename from src/model/Note.java
rename to src/Note.java
diff --git a/src/model/NoteItemData.java b/src/NoteItemData.java
similarity index 100%
rename from src/model/NoteItemData.java
rename to src/NoteItemData.java
diff --git a/src/model/NoteWidgetProvider.java b/src/NoteWidgetProvider.java
similarity index 100%
rename from src/model/NoteWidgetProvider.java
rename to src/NoteWidgetProvider.java
diff --git a/src/model/Notes.java b/src/Notes.java
similarity index 100%
rename from src/model/Notes.java
rename to src/Notes.java
diff --git a/src/model/NotesDatabaseHelper.java b/src/NotesDatabaseHelper.java
similarity index 100%
rename from src/model/NotesDatabaseHelper.java
rename to src/NotesDatabaseHelper.java
diff --git a/src/model/NotesListActivity.java b/src/NotesListActivity.java
similarity index 100%
rename from src/model/NotesListActivity.java
rename to src/NotesListActivity.java
diff --git a/src/model/NotesListAdapter.java b/src/NotesListAdapter.java
similarity index 100%
rename from src/model/NotesListAdapter.java
rename to src/NotesListAdapter.java
diff --git a/src/model/NotesListItem.java b/src/NotesListItem.java
similarity index 100%
rename from src/model/NotesListItem.java
rename to src/NotesListItem.java
diff --git a/src/model/NotesPreferenceActivity.java b/src/NotesPreferenceActivity.java
similarity index 100%
rename from src/model/NotesPreferenceActivity.java
rename to src/NotesPreferenceActivity.java
diff --git a/src/model/WorkingNote.java b/src/WorkingNote.java
similarity index 92%
rename from src/model/WorkingNote.java
rename to src/WorkingNote.java
index daeba40..57a8802 100644
--- a/src/model/WorkingNote.java
+++ b/src/WorkingNote.java
@@ -4,6 +4,7 @@
  * WorkingNote 类负责处理工作笔记的具体逻辑，包括创建、加载、保存以及与用户交互的其他功能。
  */
 public class WorkingNote {
+<<<<<<< HEAD:src/model/WorkingNote.java
 
     // 成员变量声明，用于存储笔记的相关信息
     private Note mNote; // 笔记对象，用于管理笔记的数据和同步
@@ -18,6 +19,23 @@ public class WorkingNote {
     private long mFolderId; // 文件夹ID，表示笔记所在的文件夹
     private Context mContext; // 应用程序上下文环境
     private static final String TAG = "WorkingNote"; // 日志标签，方便调试
+=======
+    // 成员变量声明，用于存储笔记的相关信息，例如：笔记对象、ID、内容、模式、提醒日期等
+    private Note mNote; // 笔记对象
+    private long mNoteId; // 笔记ID
+    private String mContent; // 笔记内容
+    private int mMode; // 笔记模式（如普通笔记或清单模式）
+    private long mAlertDate; // 提醒时间
+    private long mModifiedDate; // 修改时间
+    private int mBgColorId; // 背景颜色ID
+    private int mWidgetId; // 小部件ID
+    private int mWidgetType; // 小部件类型
+    private long mFolderId; // 文件夹ID
+    private Context mContext; // 上下文环境
+    private static final String TAG = "WorkingNote"; // 日志标签
+    private boolean mIsDeleted; // 标记笔记是否被删除
+    private NoteSettingChangedListener mNoteSettingStatusListener; // 笔记设置状态变化监听器
+>>>>>>> b68eae7307def284c1442538eae5541074c77ae5:src/WorkingNote.java
 
     // 定义列名投影数组，用于查询时指定需要获取的字段。
     public static final String[] DATA_PROJECTION = new String[]{