diff --git a/.DS_Store b/.DS_Store
index 055f2cf7..d3a7b832 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/.gitignore b/.gitignore
index 09bdfeaa..0cb3ee60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 ######################################################################
 # Build Tools
 
@@ -43,4 +44,32 @@ nbdist/
 
 !*/build/*.java
 !*/build/*.html
-!*/build/*.xml
\ No newline at end of file
+!*/build/*.xml
+=======
+# ---> Java
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+replay_pid*
+
+>>>>>>> c801920fb42d7235b4c6bde29bc433b89846e064
diff --git a/README.md b/README.md
index e69de29b..6394e3fa 100644
--- a/README.md
+++ b/README.md
@@ -0,0 +1,3 @@
+# unis_sip
+
+紫光汇智sip系统
\ No newline at end of file
diff --git a/ruoyi-admin/.DS_Store b/ruoyi-admin/.DS_Store
index 9a874b57..1a323ba1 100644
Binary files a/ruoyi-admin/.DS_Store and b/ruoyi-admin/.DS_Store differ
diff --git a/ruoyi-admin/src/.DS_Store b/ruoyi-admin/src/.DS_Store
index 7b0d3672..a2dced4c 100644
Binary files a/ruoyi-admin/src/.DS_Store and b/ruoyi-admin/src/.DS_Store differ
diff --git a/ruoyi-admin/src/main/.DS_Store b/ruoyi-admin/src/main/.DS_Store
index 30be5513..6bfc672c 100644
Binary files a/ruoyi-admin/src/main/.DS_Store and b/ruoyi-admin/src/main/.DS_Store differ
diff --git a/ruoyi-admin/src/main/resources/.DS_Store b/ruoyi-admin/src/main/resources/.DS_Store
index 113aba2f..18661cdb 100644
Binary files a/ruoyi-admin/src/main/resources/.DS_Store and b/ruoyi-admin/src/main/resources/.DS_Store differ
diff --git a/ruoyi-admin/src/main/resources/templates/.DS_Store b/ruoyi-admin/src/main/resources/templates/.DS_Store
index 34b552f0..8060929b 100644
Binary files a/ruoyi-admin/src/main/resources/templates/.DS_Store and b/ruoyi-admin/src/main/resources/templates/.DS_Store differ
diff --git a/ruoyi-admin/src/main/resources/templates/manage/.DS_Store b/ruoyi-admin/src/main/resources/templates/manage/.DS_Store
index cedf181b..002e0e15 100644
Binary files a/ruoyi-admin/src/main/resources/templates/manage/.DS_Store and b/ruoyi-admin/src/main/resources/templates/manage/.DS_Store differ
diff --git a/ruoyi-admin/src/main/resources/templates/system/.DS_Store b/ruoyi-admin/src/main/resources/templates/system/.DS_Store
index b4a61714..3a7d3a19 100644
Binary files a/ruoyi-admin/src/main/resources/templates/system/.DS_Store and b/ruoyi-admin/src/main/resources/templates/system/.DS_Store differ
diff --git a/ruoyi-common/.DS_Store b/ruoyi-common/.DS_Store
new file mode 100644
index 00000000..dd27ea32
Binary files /dev/null and b/ruoyi-common/.DS_Store differ
diff --git a/ruoyi-framework/.DS_Store b/ruoyi-framework/.DS_Store
new file mode 100644
index 00000000..58f015d2
Binary files /dev/null and b/ruoyi-framework/.DS_Store differ
diff --git a/ruoyi-generator/.DS_Store b/ruoyi-generator/.DS_Store
new file mode 100644
index 00000000..4cf7a039
Binary files /dev/null and b/ruoyi-generator/.DS_Store differ
diff --git a/ruoyi-quartz/.DS_Store b/ruoyi-quartz/.DS_Store
new file mode 100644
index 00000000..e2960de9
Binary files /dev/null and b/ruoyi-quartz/.DS_Store differ
diff --git a/ruoyi-sip/.DS_Store b/ruoyi-sip/.DS_Store
index 4154364b..5db4027e 100644
Binary files a/ruoyi-sip/.DS_Store and b/ruoyi-sip/.DS_Store differ
diff --git a/ruoyi-sip/src/.DS_Store b/ruoyi-sip/src/.DS_Store
index 909f7b5c..79703997 100644
Binary files a/ruoyi-sip/src/.DS_Store and b/ruoyi-sip/src/.DS_Store differ
diff --git a/ruoyi-sip/src/main/.DS_Store b/ruoyi-sip/src/main/.DS_Store
index 5ddc54c0..cfe0de3f 100644
Binary files a/ruoyi-sip/src/main/.DS_Store and b/ruoyi-sip/src/main/.DS_Store differ
diff --git a/ruoyi-sip/src/main/java/.DS_Store b/ruoyi-sip/src/main/java/.DS_Store
index 35a54bf0..a1a6b696 100644
Binary files a/ruoyi-sip/src/main/java/.DS_Store and b/ruoyi-sip/src/main/java/.DS_Store differ
diff --git a/ruoyi-sip/src/main/java/com/.DS_Store b/ruoyi-sip/src/main/java/com/.DS_Store
index 5c654ad5..4919bf20 100644
Binary files a/ruoyi-sip/src/main/java/com/.DS_Store and b/ruoyi-sip/src/main/java/com/.DS_Store differ
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/.DS_Store b/ruoyi-sip/src/main/java/com/ruoyi/.DS_Store
index 504b44ca..ef10194e 100644
Binary files a/ruoyi-sip/src/main/java/com/ruoyi/.DS_Store and b/ruoyi-sip/src/main/java/com/ruoyi/.DS_Store differ
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/.DS_Store b/ruoyi-sip/src/main/java/com/ruoyi/sip/.DS_Store
index fa44b655..e391c24e 100644
Binary files a/ruoyi-sip/src/main/java/com/ruoyi/sip/.DS_Store and b/ruoyi-sip/src/main/java/com/ruoyi/sip/.DS_Store differ
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/.DS_Store b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/.DS_Store
index d320a78a..97a93bef 100644
Binary files a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/.DS_Store and b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/.DS_Store differ
diff --git a/ruoyi-sip/src/main/resources/.DS_Store b/ruoyi-sip/src/main/resources/.DS_Store
index d7aec652..dfd10d4f 100644
Binary files a/ruoyi-sip/src/main/resources/.DS_Store and b/ruoyi-sip/src/main/resources/.DS_Store differ
diff --git a/ruoyi-sip/src/main/resources/mapper/.DS_Store b/ruoyi-sip/src/main/resources/mapper/.DS_Store
index 553c9e11..8547924c 100644
Binary files a/ruoyi-sip/src/main/resources/mapper/.DS_Store and b/ruoyi-sip/src/main/resources/mapper/.DS_Store differ
diff --git a/ruoyi-system/.DS_Store b/ruoyi-system/.DS_Store
new file mode 100644
index 00000000..f7478ae0
Binary files /dev/null and b/ruoyi-system/.DS_Store differ