change

Merge remote-tracking branch 'origin/shenxianbao_branch' into shenxianbao_branch
# Conflicts: # Used-Trading-Platform-master/src/main/java/com/wsk/controller/UserController.java # Used-Trading-Platform-master/src/main/webapp/js/jquery-1.12.4.js # src/main/java/com/wsk/controller/ForgetController.java
6 changed files with 41 additions and 1 deletions
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@ -0,0 +1,8 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/Used-Trading-Platform.txt/Used-Trading-Platform-master/Used-Trading-Platform-master.iml" filepath="$PROJECT_DIR$/Used-Trading-Platform.txt/Used-Trading-Platform-master/Used-Trading-Platform-master.iml" />
+      <module fileurl="file://$PROJECT_DIR$/Used-Trading-Platform.txt/src/Used-Trading-Platform.txt.iml" filepath="$PROJECT_DIR$/Used-Trading-Platform.txt/src/Used-Trading-Platform.txt.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/新建文件夹.iml" filepath="$PROJECT_DIR$/.idea/新建文件夹.iml" />
+    </modules>
+  </component>
+</project>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/Used-Trading-Platform.txt" vcs="Git" />
+  </component>
+</project>
--- a/.idea/新建文件夹.iml
+++ b/.idea/新建文件夹.iml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
--- a/Used-Trading-Platform.txt
+++ b/Used-Trading-Platform.txt
@ -1 +1 @@
-Subproject commit 0217d32d7e3f141da75de17dbede58ade3dec998
+Subproject commit 4f48947545cd6024d861a772693fd64e2374a9b4