Merge branch 'master' of http://gitlab.oytour.com/chun/theater

# Conflicts: # EheMall.Web/Areas/TicketMall/Views/Login/Index.cshtml

Merge branch 'master' of http://gitlab.oytour.com/chun/theater
# Conflicts: # EheMall.Web/Areas/TicketMall/Views/Login/Index.cshtml
1e364889 · chun · b3b5dfa9 · 5f8c17fc · 1e364889
Commit 1e364889 authored Jan 28, 2019 by chun
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

Index.cshtml EheMall.Web/Areas/TicketMall/Views/Login/Index.cshtml +1 -0

No files found.
--- a/EheMall.Web/Areas/TicketMall/Views/Login/Index.cshtml
+++ b/EheMall.Web/Areas/TicketMall/Views/Login/Index.cshtml
@@ -70,6 +70,7 @@
                layer.msg('请输入密码');
                return;
            }
+            //测试1·11111
            $.ajax({
                type: "post",
                url: "@Url.Action("Index")",