diff --git a/.idea/artifacts/equipment_Web2_exploded.xml b/.idea/artifacts/equipment_Web2_exploded.xml
new file mode 100644
index 0000000..e91cab1
--- /dev/null
+++ b/.idea/artifacts/equipment_Web2_exploded.xml
@@ -0,0 +1,13 @@
+<component name="ArtifactManager">
+  <artifact type="exploded-war" name="equipment:Web2 exploded">
+    <output-path>$PROJECT_DIR$/out/artifacts/equipment_Web2_exploded</output-path>
+    <root id="root">
+      <element id="javaee-facet-resources" facet="equipment/web/Web2" />
+      <element id="directory" name="WEB-INF">
+        <element id="directory" name="classes">
+          <element id="module-output" name="equipment" />
+        </element>
+      </element>
+    </root>
+  </artifact>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/aspectjweaver_1_9_7.xml b/.idea/libraries/aspectjweaver_1_9_7.xml
new file mode 100644
index 0000000..b9a6c17
--- /dev/null
+++ b/.idea/libraries/aspectjweaver_1_9_7.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="aspectjweaver-1.9.7">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/equipment-SpringMVCProject/web/WEB-INF/lib/aspectjweaver-1.9.7.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/libs.xml b/.idea/libraries/libs.xml
new file mode 100644
index 0000000..8bef210
--- /dev/null
+++ b/.idea/libraries/libs.xml
@@ -0,0 +1,18 @@
+<component name="libraryTable">
+  <library name="libs">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/equipment-SpringProject/src/libs/jsp-api.jar!/" />
+      <root url="jar://$PROJECT_DIR$/equipment-SpringProject/src/libs/spring-expression-5.1.6.RELEASE.jar!/" />
+      <root url="jar://$PROJECT_DIR$/equipment-SpringProject/src/libs/commons-logging-1.1.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/equipment-SpringProject/src/libs/spring-beans-5.1.6.RELEASE.jar!/" />
+      <root url="jar://$PROJECT_DIR$/equipment-SpringProject/src/libs/spring-aop-5.1.6.RELEASE.jar!/" />
+      <root url="jar://$PROJECT_DIR$/equipment-SpringProject/src/libs/spring-context-5.1.6.RELEASE.jar!/" />
+      <root url="jar://$PROJECT_DIR$/equipment-SpringProject/src/libs/spring-web-5.1.6.RELEASE.jar!/" />
+      <root url="jar://$PROJECT_DIR$/equipment-SpringProject/src/libs/spring-webmvc-5.1.6.RELEASE.jar!/" />
+      <root url="jar://$PROJECT_DIR$/equipment-SpringProject/src/libs/aspectjweaver-1.9.7.jar!/" />
+      <root url="jar://$PROJECT_DIR$/equipment-SpringProject/src/libs/spring-core-5.1.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/servlet_api.xml b/.idea/libraries/servlet_api.xml
new file mode 100644
index 0000000..392a5ca
--- /dev/null
+++ b/.idea/libraries/servlet_api.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="servlet-api">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/equipment/web/WEB-INF/lib/servlet-api.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/equipment/equipment.iml b/equipment/equipment.iml
index 4703a20..3ff1dea 100644
--- a/equipment/equipment.iml
+++ b/equipment/equipment.iml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="FacetManager">
-    <facet type="web" name="Web">
+    <facet type="web" name="Web2">
       <configuration>
         <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/web/web/WEB-INF/web.xml" />
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/web/WEB-INF/web.xml" />
+          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/web2/web/WEB-INF/web.xml" />
+          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/web2/WEB-INF/web.xml" />
         </descriptors>
         <webroots>
-          <root url="file://$MODULE_DIR$/web" relative="/" />
+          <root url="file://$MODULE_DIR$/web2" relative="/" />
         </webroots>
       </configuration>
     </facet>
@@ -21,5 +21,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="library" name="servlet-api" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/out/artifacts/equipment_SpringMVCProject_Web_exploded/WEB-INF/lib/servlet-api.jar b/equipment/web/WEB-INF/lib/servlet-api.jar
similarity index 100%
rename from out/artifacts/equipment_SpringMVCProject_Web_exploded/WEB-INF/lib/servlet-api.jar
rename to equipment/web/WEB-INF/lib/servlet-api.jar
diff --git a/equipment/web2/WEB-INF/web.xml b/equipment/web2/WEB-INF/web.xml
new file mode 100644
index 0000000..d80081d
--- /dev/null
+++ b/equipment/web2/WEB-INF/web.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
+         version="4.0">
+</web-app>
\ No newline at end of file
diff --git a/out/artifacts/equipment_SpringMVCProject_Web_exploded/First.jsp b/out/artifacts/equipment_SpringMVCProject_Web_exploded/First.jsp
index b415e6b..cd91836 100644
--- a/out/artifacts/equipment_SpringMVCProject_Web_exploded/First.jsp
+++ b/out/artifacts/equipment_SpringMVCProject_Web_exploded/First.jsp
@@ -8,7 +8,7 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <html>
 <head>
-  <title>入门程序</title>
+    <title>入门程序</title>
 </head>
 <body>
 <a href="hello">hello world</a>
diff --git a/out/artifacts/equipment_SpringMVCProject_Web_exploded/WEB-INF/classes/com/ssm/controller/MaterialController.class b/out/artifacts/equipment_SpringMVCProject_Web_exploded/WEB-INF/classes/com/ssm/controller/MaterialController.class
index 8b350cf..4c6d0ca 100644
Binary files a/out/artifacts/equipment_SpringMVCProject_Web_exploded/WEB-INF/classes/com/ssm/controller/MaterialController.class and b/out/artifacts/equipment_SpringMVCProject_Web_exploded/WEB-INF/classes/com/ssm/controller/MaterialController.class differ
diff --git a/out/artifacts/equipment_SpringMVCProject_Web_exploded/WEB-INF/lib/spring-aspects-5.1.6.RELEASE.jar b/out/artifacts/equipment_SpringMVCProject_Web_exploded/WEB-INF/lib/spring-aspects-5.1.6.RELEASE.jar
deleted file mode 100644
index 18c4416..0000000
Binary files a/out/artifacts/equipment_SpringMVCProject_Web_exploded/WEB-INF/lib/spring-aspects-5.1.6.RELEASE.jar and /dev/null differ
diff --git a/out/artifacts/equipment_SpringMVCProject_Web_exploded/WEB-INF/springmvc.xml b/out/artifacts/equipment_SpringMVCProject_Web_exploded/WEB-INF/springmvc.xml
index 81395cd..c810f6f 100644
--- a/out/artifacts/equipment_SpringMVCProject_Web_exploded/WEB-INF/springmvc.xml
+++ b/out/artifacts/equipment_SpringMVCProject_Web_exploded/WEB-INF/springmvc.xml
@@ -11,16 +11,13 @@
         http://www.springframework.org/schema/mvc
         http://www.springframework.org/schema/mvc/spring-mvc.xsd">
 
-	<!-- 1. 扫描Controller包 -->
-	<context:component-scan base-package="com.ssm.controller"/>
 
-	<!-- 2. 开启注解驱动（解决请求映射、参数绑定） -->
+	<context:component-scan base-package="com.ssm"/>
+
+
 	<mvc:annotation-driven/>
 
-	<!-- 3. 放行静态资源（jsp、html、css等） -->
-	<mvc:default-servlet-handler/>
 
-	<!-- 4. 视图解析器：对应WEB-INF/view下的jsp文件 -->
 	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
 		<property name="prefix" value="/WEB-INF/view/"/>
 		<property name="suffix" value=".jsp"/>
diff --git a/out/artifacts/equipment_SpringMVCProject_Web_exploded/WEB-INF/view/showFirst.jsp b/out/artifacts/equipment_SpringMVCProject_Web_exploded/WEB-INF/view/showFirst.jsp
index a80b94f..c4292f2 100644
--- a/out/artifacts/equipment_SpringMVCProject_Web_exploded/WEB-INF/view/showFirst.jsp
+++ b/out/artifacts/equipment_SpringMVCProject_Web_exploded/WEB-INF/view/showFirst.jsp
@@ -1,8 +1,8 @@
 <%--
   Created by IntelliJ IDEA.
   User: AA7
-  Date: 2026/5/13
-  Time: 14:12
+  Date: 2026/4/23
+  Time: 14:21
   To change this template use File | Settings | File Templates.
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
diff --git a/out/artifacts/equipment_SpringMVCProject_Web_exploded/WEB-INF/web.xml b/out/artifacts/equipment_SpringMVCProject_Web_exploded/WEB-INF/web.xml
index fb948bf..959f1ab 100644
--- a/out/artifacts/equipment_SpringMVCProject_Web_exploded/WEB-INF/web.xml
+++ b/out/artifacts/equipment_SpringMVCProject_Web_exploded/WEB-INF/web.xml
@@ -1,62 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
-         version="4.0">
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+         http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+         version="3.0">
 
-<<<<<<< HEAD
-  <!-- 1. 编码过滤器：解决POST请求和页面乱码 -->
-  <filter>
-    <filter-name>encodingFilter</filter-name>
-    <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
-    <init-param>
-      <param-name>encoding</param-name>
-      <param-value>UTF-8</param-value>
-    </init-param>
-    <init-param>
-      <param-name>forceEncoding</param-name>
-      <param-value>true</param-value>
-    </init-param>
-  </filter>
-  <filter-mapping>
-    <filter-name>encodingFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
 
-  <!-- 2. SpringMVC核心控制器：直接从WEB-INF加载springmvc.xml -->
-  <servlet>
-    <servlet-name>springmvc</servlet-name>
-    <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-    <init-param>
-      <param-name>contextConfigLocation</param-name>
-      <param-value>/WEB-INF/springmvc.xml</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>springmvc</servlet-name>
-    <url-pattern>/</url-pattern>
-  </servlet-mapping>
+    <filter>
+        <filter-name>encodingFilter</filter-name>
+        <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
+        <init-param>
+            <param-name>encoding</param-name>
+            <param-value>UTF-8</param-value>
+        </init-param>
+        <init-param>
+            <param-name>forceEncoding</param-name>
+            <param-value>true</param-value>
+        </init-param>
+    </filter>
+    <filter-mapping>
+        <filter-name>encodingFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
 
-  <!-- 3. 欢迎页（可选，不会报错） -->
-  <welcome-file-list>
-    <welcome-file>addUser.jsp</welcome-file>
-  </welcome-file-list>
-=======
     <servlet>
-        <servlet-name>DispatcherServlet</servlet-name>
+        <servlet-name>springmvc</servlet-name>
         <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
         <init-param>
             <param-name>contextConfigLocation</param-name>
-            <param-value>classpath:springmvc.xml</param-value>
+            <param-value>/WEB-INF/springmvc.xml</param-value>
         </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>
-
     <servlet-mapping>
-        <servlet-name>DispatcherServlet</servlet-name>
+        <servlet-name>springmvc</servlet-name>
         <url-pattern>/</url-pattern>
     </servlet-mapping>
->>>>>>> origin/main
 
 </web-app>
\ No newline at end of file
diff --git a/out/artifacts/equipment_SpringMVCProject_Web_exploded/addLab.jsp b/out/artifacts/equipment_SpringMVCProject_Web_exploded/addLab.jsp
index 885b574..9a647d7 100644
--- a/out/artifacts/equipment_SpringMVCProject_Web_exploded/addLab.jsp
+++ b/out/artifacts/equipment_SpringMVCProject_Web_exploded/addLab.jsp
@@ -5,7 +5,7 @@
     <title>实验室管理</title>
 </head>
 <body>
-<h3>添加实验室信息</h3>
+<h3>实验室信息</h3>
 <form action="${pageContext.request.contextPath}/lab/newadd" method="post">
     实验室编号：<input type="text" name="labId"><br><br>
     实验室名称：<input type="text" name="labName"><br><br>
diff --git a/out/artifacts/equipment_SpringMVCProject_Web_exploded/addMaterial.jsp b/out/artifacts/equipment_SpringMVCProject_Web_exploded/addMaterial.jsp
index 9d1e854..9012cdb 100644
--- a/out/artifacts/equipment_SpringMVCProject_Web_exploded/addMaterial.jsp
+++ b/out/artifacts/equipment_SpringMVCProject_Web_exploded/addMaterial.jsp
@@ -5,7 +5,7 @@
     <title>添加材料</title>
 </head>
 <body>
-<h3>添加材料信息</h3>
+<h3>材料信息</h3>
 <form action="${pageContext.request.contextPath}/material/newadd" method="post">
     材料编号：<input type="text" name="mid"><br><br>
     材料名称：<input type="text" name="mname"><br><br>
diff --git a/out/artifacts/equipment_SpringMVCProject_Web_exploded/addMaterialStock.jsp b/out/artifacts/equipment_SpringMVCProject_Web_exploded/addMaterialStock.jsp
index 6cebe21..3399535 100644
--- a/out/artifacts/equipment_SpringMVCProject_Web_exploded/addMaterialStock.jsp
+++ b/out/artifacts/equipment_SpringMVCProject_Web_exploded/addMaterialStock.jsp
@@ -5,7 +5,7 @@
     <title>材料出入库</title>
 </head>
 <body>
-<h3>添加材料出入库记录</h3>
+<h3>材料出入库记录</h3>
 <form action="${pageContext.request.contextPath}/stock/newadd" method="post">
     记录编号：<input type="text" name="stockId"><br><br>
     材料编号：<input type="text" name="mid"><br><br>
diff --git a/out/artifacts/equipment_SpringMVCProject_Web_exploded/addReservation.jsp b/out/artifacts/equipment_SpringMVCProject_Web_exploded/addReservation.jsp
index 3f2f15f..6ea9abd 100644
--- a/out/artifacts/equipment_SpringMVCProject_Web_exploded/addReservation.jsp
+++ b/out/artifacts/equipment_SpringMVCProject_Web_exploded/addReservation.jsp
@@ -5,7 +5,7 @@
     <title>预约管理</title>
 </head>
 <body>
-<h3>添加预约信息</h3>
+<h3>预约信息</h3>
 <form action="${pageContext.request.contextPath}/reservation/newadd" method="post">
     预约编号：<input type="text" name="rid"><br><br>
     用户编号：<input type="text" name="uid"><br><br>
diff --git a/out/production/equipment-SpringMVCProject/springmvc.xml b/out/production/equipment-SpringMVCProject/springmvc.xml
deleted file mode 100644
index 8425f55..0000000
--- a/out/production/equipment-SpringMVCProject/springmvc.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xmlns:context="http://www.springframework.org/schema/context"
-	   xmlns:mvc="http://www.springframework.org/schema/mvc"
-	   xsi:schemaLocation="
-        http://www.springframework.org/schema/beans
-        https://www.springframework.org/schema/beans/spring-beans.xsd
-        http://www.springframework.org/schema/context
-        https://www.springframework.org/schema/context/spring-context.xsd
-        http://www.springframework.org/schema/mvc
-        https://www.springframework.org/schema/mvc/spring-mvc.xsd">
-
-
-	<context:component-scan base-package="com.ssm.controller"/>
-
-
-	<mvc:annotation-driven/>
-
-
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-
-		<property name="prefix" value="/"/>
-		<property name="suffix" value=".jsp"/>
-	</bean>
-
-</beans>
\ No newline at end of file
diff --git a/out/production/equipment/com/ssm/controller/DemoController.class b/out/production/equipment/com/ssm/controller/DemoController.class
index 70cd695..3c9fe9a 100644
Binary files a/out/production/equipment/com/ssm/controller/DemoController.class and b/out/production/equipment/com/ssm/controller/DemoController.class differ