Merge remote-tracking branch 'origin/mian-dev' into mian-dev

# Conflicts: # interface/TestUpdate.jsp
2 years ago · 04fc18f84c
parent 65f87f191b b9ca0837ba
commit 04fc18f84c
1 changed files with 1 additions and 2 deletions
--- a/interface/TestUpdate.jsp
+++ b/interface/TestUpdate.jsp
@ -1,6 +1,5 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" %>
 <%
    int count = 0;
-    String test = "11111";
+    String cs = "";
 %>