顺义中医

0cbf1af5 · yanxiaofei · 56149160 · 250313bb · 0cbf1af5
Commit 0cbf1af5 authored Jun 12, 2024 by yanxiaofei
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

login.html src/main/resources/templates/login.html +4 -0

No files found.
--- a/src/main/resources/templates/login.html
+++ b/src/main/resources/templates/login.html
@@ -245,7 +245,11 @@
 			//回调ca  GetCertEntity方法，并回调getuser方法
 			GetCertEntity(strServerCert,getUser);
 		}
+<<<<<<< HEAD
 		function severLogin(forceLogin){//alert(forceLogin);
+=======
+		function severLogin(forceLogin){
+>>>>>>> 250313bb7ba1ed1d5a94b7230af4715b491743c4
 			 
 			if(check()){
 				var loginname = $("#loginname").val();