Merge remote-tracking branch 'origin/Django' into Django

elastic/urls.py

@@ -32,4 +32,5 @@ urlpatterns = [
 
     # 管理页面
     path('manage/', views.manage_page, name='manage_page'),
+    path('user_manage/', views.user_manage, name='user_manage'),
 ]

main/templates/main/home.html

@@ -141,7 +141,6 @@
       <a href="{% url 'main:home' %}" onclick="return handleNavClick(this, '/');">主页</a>
       <a href="{% url 'elastic:upload_page' %}" onclick="return handleNavClick(this, '/elastic/upload/');">图片上传与识别</a>
       <a href="{% url 'elastic:manage_page' %}" onclick="return handleNavClick(this, '/elastic/manage/');">数据管理</a>
-      <a href="/elastic/users/" onclick="return handleNavClick(this, '/elastic/users/');">用户管理</a>
       <button id="logoutBtn">退出登录</button>
       <div id="logoutMsg"></div>
       {% csrf_token %}