diff --git "a/work/com/java/minxi/java_20240531/java_2302_\345\210\230\350\264\244\345\233\275_2344310219/index.jsp" "b/work/com/java/minxi/java_20240531/java_2302_\345\210\230\350\264\244\345\233\275_2344310219/index.jsp"
index f546ec66d6ad6fa310d36eb3aabdab2c2c4fb516..75ed8877774eec8e4e13808bb03c708292f79639 100644
--- "a/work/com/java/minxi/java_20240531/java_2302_\345\210\230\350\264\244\345\233\275_2344310219/index.jsp"
+++ "b/work/com/java/minxi/java_20240531/java_2302_\345\210\230\350\264\244\345\233\275_2344310219/index.jsp"
@@ -5,7 +5,11 @@
Time: 16:59
To change this template use File | Settings | File Templates.
--%>
+<<<<<<< HEAD
+<%@ page contentType="text/html;charset=UTF-8" language="java" pageEncoding="UTF-8" %>
+=======
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+>>>>>>> origin/lxg19
@@ -79,7 +83,6 @@
out.println(i+"*"+j+"="+j*i);
}
}
-
%>
diff --git "a/work/com/java/minxi/java_20240605/java_2302_\345\210\230\350\264\244\345\233\275_2344310219/circle.jsp" "b/work/com/java/minxi/java_20240605/java_2302_\345\210\230\350\264\244\345\233\275_2344310219/circle.jsp"
new file mode 100644
index 0000000000000000000000000000000000000000..10af21eef4d86f0ee2f45a1c15c5708a47e333b4
--- /dev/null
+++ "b/work/com/java/minxi/java_20240605/java_2302_\345\210\230\350\264\244\345\233\275_2344310219/circle.jsp"
@@ -0,0 +1,20 @@
+<%--
+ Created by IntelliJ IDEA.
+ User: Administrator
+ Date: 2024-06-06
+ Time: 19:57
+ To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+
+ Title
+
+
+<%
+double r=3;
+out.println("面积"+3.13*r*r);
+%>
+
+
+
diff --git "a/work/com/java/minxi/java_20240605/java_2302_\345\210\230\350\264\244\345\233\275_2344310219/ladder.jsp" "b/work/com/java/minxi/java_20240605/java_2302_\345\210\230\350\264\244\345\233\275_2344310219/ladder.jsp"
new file mode 100644
index 0000000000000000000000000000000000000000..67aa5576ccbe333c81dd17726f4aecf0ada27f1b
--- /dev/null
+++ "b/work/com/java/minxi/java_20240605/java_2302_\345\210\230\350\264\244\345\233\275_2344310219/ladder.jsp"
@@ -0,0 +1,24 @@
+<%--
+ Created by IntelliJ IDEA.
+ User: Administrator
+ Date: 2024-06-06
+ Time: 19:57
+ To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+
+ Title
+
+
+<%!
+double up=2;
+double down=3;
+double high=5;
+%>
+<%
+out.println("面积"+(up+down)*high/2);
+
+%>
+
+
diff --git "a/work/com/java/minxi/java_20240605/java_2302_\345\210\230\350\264\244\345\233\275_2344310219/main.jsp" "b/work/com/java/minxi/java_20240605/java_2302_\345\210\230\350\264\244\345\233\275_2344310219/main.jsp"
new file mode 100644
index 0000000000000000000000000000000000000000..74fa7ba4e8a75acb4bba437277b5241abfb7c753
--- /dev/null
+++ "b/work/com/java/minxi/java_20240605/java_2302_\345\210\230\350\264\244\345\233\275_2344310219/main.jsp"
@@ -0,0 +1,23 @@
+<%--
+ Created by IntelliJ IDEA.
+ User: Administrator
+ Date: 2024-06-06
+ Time: 19:29
+ To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+
+
+ Title
+
+
+
+>
+
+
+
+
+
+
+