From 8aef28e39575b910aa08c0c102c868d60fb306ea Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 11 七月 2020 16:10:42 +0800
Subject: [PATCH] Merge branch 'dev' of https://gitee.com/luxiaotao1123/zy-asrs
---
src/main/webapp/views/locMast/locMast.html | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/views/locMast/locMast.html b/src/main/webapp/views/locMast/locMast.html
index 85406b5..2fc2770 100644
--- a/src/main/webapp/views/locMast/locMast.html
+++ b/src/main/webapp/views/locMast/locMast.html
@@ -142,7 +142,7 @@
</div>
</div>
<div id="prompt" style="text-indent: 10px;">
- <span class="not-null">鍒濆鍖栦細娓呴櫎搴撲綅鎵�鏈夋暟鎹紝璇疯皑鎱庢搷浣滐紒</span>
+ <span class="not-null">鍒濆鍖栧簱浣嶅悗灏嗗垹闄ゅ簱瀛樻槑缁嗭紝璇疯皑鎱庢搷浣滐紒</span>
</div>
<!-- 鎸夐挳 -->
<div style="text-align: center; margin-top: 20px">
--
Gitblit v1.9.1