Merge remote-tracking branch 'origin/shenxianbao_branch' into shenxianbao_branch

.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

.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>

.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/ruangong.iml" filepath="$PROJECT_DIR$/.idea/ruangong.iml" />
+    </modules>
+  </component>
+</project>

.idea/ruangong.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>

.idea/vcs.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/Used-Trading-Platform.txt" vcs="Git" />
+  </component>
+</project>

Used-Trading-Platform.txt

@@ -0,0 +1 @@
+Subproject commit 9a58e282acfe9a7ef68d3c0603266324e8bae64a