diff --git a/lms/.idea/.gitignore b/lms/.idea/.gitignore
deleted file mode 100644
index 463c03e..0000000
--- a/lms/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# 默认忽略的文件
-/shelf/
-/workspace.xml
-# 基于编辑器的 HTTP 客户端请求
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
diff --git a/lms/.idea/EasyApiProjectSetting.xml b/lms/.idea/EasyApiProjectSetting.xml
deleted file mode 100644
index bd4b6c5..0000000
--- a/lms/.idea/EasyApiProjectSetting.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/lms/.idea/active-tab-highlighter.xml b/lms/.idea/active-tab-highlighter.xml
deleted file mode 100644
index 5e16a61..0000000
--- a/lms/.idea/active-tab-highlighter.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/lms/.idea/checkstyle-idea.xml b/lms/.idea/checkstyle-idea.xml
deleted file mode 100644
index 90a2626..0000000
--- a/lms/.idea/checkstyle-idea.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/lms/.idea/compiler.xml b/lms/.idea/compiler.xml
deleted file mode 100644
index 00a9fda..0000000
--- a/lms/.idea/compiler.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/lms/.idea/dictionaries b/lms/.idea/dictionaries
deleted file mode 100644
index 9073b48..0000000
--- a/lms/.idea/dictionaries
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/lms/.idea/easyCodeTableSetting.xml b/lms/.idea/easyCodeTableSetting.xml
deleted file mode 100644
index 9742d6a..0000000
--- a/lms/.idea/easyCodeTableSetting.xml
+++ /dev/null
@@ -1,2405 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/lms/.idea/encodings.xml b/lms/.idea/encodings.xml
deleted file mode 100644
index 40ba947..0000000
--- a/lms/.idea/encodings.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/lms/.idea/inspectionProfiles/Project_Default.xml b/lms/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 8d66637..0000000
--- a/lms/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/lms/.idea/jarRepositories.xml b/lms/.idea/jarRepositories.xml
deleted file mode 100644
index 0a43837..0000000
--- a/lms/.idea/jarRepositories.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/lms/.idea/misc.xml b/lms/.idea/misc.xml
deleted file mode 100644
index 158b123..0000000
--- a/lms/.idea/misc.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/lms/.idea/modules.xml b/lms/.idea/modules.xml
deleted file mode 100644
index ab503c9..0000000
--- a/lms/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/lms/.idea/vcs.xml b/lms/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/lms/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/lms/.idea/wms.iml b/lms/.idea/wms.iml
deleted file mode 100644
index d6ebd48..0000000
--- a/lms/.idea/wms.iml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/lms/nladmin-system/.gitignore b/lms/nladmin-system/.gitignore
index 190a4ce..db21bbc 100644
--- a/lms/nladmin-system/.gitignore
+++ b/lms/nladmin-system/.gitignore
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
### IDEA ###
*/*.log
.idea/*
@@ -8,7 +7,6 @@
/.gradle/
/target/*
*/application-dev.yml
-=======
# ---> Java
# Compiled class file
*.class
@@ -34,4 +32,4 @@
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
->>>>>>> 18ce5d210133a3763e002308fe1d91183994a785
+/.idea/
diff --git a/lms/nladmin-system/README.md b/lms/nladmin-system/README.md
index 598fae9..bdfda44 100644
--- a/lms/nladmin-system/README.md
+++ b/lms/nladmin-system/README.md
@@ -1,6 +1,5 @@
-
-# WMS鏍囧噯鐗1.0
-=======
+# 鏍床涓挩LMS绯荤粺
+## WMS鏍囧噯鐗1.0
# PC鍔熻兘娓呭崟
# 鎵嬫寔鍔熻兘娓呭崟
diff --git a/lms/nladmin-system/nlsso-server/.idea/.gitignore b/lms/nladmin-system/nlsso-server/.idea/.gitignore
deleted file mode 100644
index 35410ca..0000000
--- a/lms/nladmin-system/nlsso-server/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# 榛樿蹇界暐鐨勬枃浠
-/shelf/
-/workspace.xml
-# 鍩轰簬缂栬緫鍣ㄧ殑 HTTP 瀹㈡埛绔姹
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
diff --git a/lms/nladmin-system/nlsso-server/.idea/compiler.xml b/lms/nladmin-system/nlsso-server/.idea/compiler.xml
deleted file mode 100644
index 00a9fda..0000000
--- a/lms/nladmin-system/nlsso-server/.idea/compiler.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/lms/nladmin-system/nlsso-server/.idea/encodings.xml b/lms/nladmin-system/nlsso-server/.idea/encodings.xml
deleted file mode 100644
index 63e9001..0000000
--- a/lms/nladmin-system/nlsso-server/.idea/encodings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/lms/nladmin-system/nlsso-server/.idea/jarRepositories.xml b/lms/nladmin-system/nlsso-server/.idea/jarRepositories.xml
deleted file mode 100644
index 712ab9d..0000000
--- a/lms/nladmin-system/nlsso-server/.idea/jarRepositories.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/lms/nladmin-system/nlsso-server/.idea/misc.xml b/lms/nladmin-system/nlsso-server/.idea/misc.xml
deleted file mode 100644
index d5cd614..0000000
--- a/lms/nladmin-system/nlsso-server/.idea/misc.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/lms/nladmin-system/nlsso-server/.idea/vcs.xml b/lms/nladmin-system/nlsso-server/.idea/vcs.xml
deleted file mode 100644
index b2bdec2..0000000
--- a/lms/nladmin-system/nlsso-server/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file