From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/webapp/js/utils.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/js/utils.js b/src/main/webapp/js/utils.js
index 58dfcf3..3d4db8e 100644
--- a/src/main/webapp/js/utils.js
+++ b/src/main/webapp/js/utils.js
@@ -1,4 +1,4 @@
-//paraName ���������������������
+//paraName ���������������
function getUrlParam(paraName) {
var url = document.location.toString();
var arrObj = url.split("?");
--
Gitblit v1.8.0