#HT-1 解决冲突#

# Conflicts:
#	interface/TestUpdate.jsp

interface/TestUpdate.jsp

@@ -0,0 +1,6 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" %>
+<%
+    int count = 0;
+    String cs = "";
+    String test = "11111";
+%>

src/weaver/interfaces/shil/UpdateStatusAction.java

@@ -0,0 +1,4 @@
+package weaver.interfaces.shil;
+
+public class UpdateStatusAction {
+}