From ba59c4231d0ea910a4a247103ff07ce4fcbd99eb Mon Sep 17 00:00:00 2001
From: TianZhou <3570544406@qq.com>
Date: Mon, 26 Aug 2024 11:20:13 +0800
Subject: [PATCH] merge

---
 .gitignore           |  1 +
 .idea/OM.iml         | 12 ++++++++++++
 .idea/UniappTool.xml | 10 ++++++++++
 .idea/modules.xml    |  8 ++++++++
 .idea/vcs.xml        |  6 ++++++
 5 files changed, 37 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 .idea/OM.iml
 create mode 100644 .idea/UniappTool.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/vcs.xml

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..7f7ecab
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/OM/unpackage/
diff --git a/.idea/OM.iml b/.idea/OM.iml
new file mode 100644
index 0000000..24643cc
--- /dev/null
+++ b/.idea/OM.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/UniappTool.xml b/.idea/UniappTool.xml
new file mode 100644
index 0000000..f7328e8
--- /dev/null
+++ b/.idea/UniappTool.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="cn.fjdmy.uniapp.UniappProjectDataService">
+    <option name="generalBasePath" value="$PROJECT_DIR$" />
+    <option name="manifestPath" value="$PROJECT_DIR$/manifest.json" />
+    <option name="pagesPath" value="$PROJECT_DIR$/pages.json" />
+    <option name="scanNum" value="1" />
+    <option name="type" value="store" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..3174a8a
--- /dev/null
+++ b/.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/OM.iml" filepath="$PROJECT_DIR$/.idea/OM.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file