Merge remote-tracking branch 'remotes/origin/hechu1'

# Conflicts: # GDMS.iml
6 years ago · ce9ae99567
parent db1069d7c1
commit ce9ae99567
2 changed files with 2180 additions and 0 deletions
--- a/.idea/dataSources/9ab10673-d584-44a7-a783-8ac833d52c51.xml
+++ b/.idea/dataSources/9ab10673-d584-44a7-a783-8ac833d52c51.xml
--- a/web/index.jsp
+++ b/web/index.jsp
@ -0,0 +1,16 @@
 <%--
  Created by IntelliJ IDEA.
  User: zhai_
  Date: 2019/1/15
  Time: 16:43
  To change this template use File | Settings | File Templates.
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <html>
  <head>
    <title>$Title$</title>
  </head>
  <body>
  $END$
  </body>
 </html>