Merge remote-tracking branch 'origin/main'

web/addItemCategory.jsp

@@ -14,6 +14,5 @@
 	<br>
 	<input type="submit" value="添加">
 </form>
-
 </body>
 </html>

web/web/WEB-INF/web.xml

@@ -1,6 +0,0 @@
-<?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>