Merge remote-tracking branch 'origin/master'

puzhibing

2023-02-16 b3ec53a9da0c09dd03da33bfc27f278d13a5d8f9

 management/guns-admin/src/main/webapp/WEB-INF/view/common/_right.html

@@ -4,7 +4,7 @@
            <div class="navbar-header"><a class="navbar-minimalize minimalize-styl-2 btn btn-primary " href="#"><i class="fa fa-bars"></i> </a>
                <form role="search" class="navbar-form-custom" method="post" action="search_results.html">
                    <div class="form-group">
                        <input type="text" placeholder="OK出行后台管理系统 …" class="form-control" name="top-search" id="top-search" value="OK出行后台管理系统" disabled>
                        <input type="text" placeholder="超省代驾后台管理系统 …" class="form-control" name="top-search" id="top-search" value="超省新代驾后台管理系统" disabled>
                    </div>
                </form>
                <h3 style="float: right;line-height: 50px;color: red;">${passwordHint}</h3>
@@ -53,7 +53,7 @@
        <iframe class="J_iframe" name="iframe0" width="100%" height="100%" src="${ctxPath}/blackboard?type=${type}" frameborder="0" data-id="${ctxPath}/blackboard" seamless></iframe>
    </div>
    <div class="footer">
        <div class="pull-right">&copy; 2019-2021 <a href="#" onclick="return false" target="_blank">OK出行</a>
        <div class="pull-right">&copy; 2019-2021 <a href="#" onclick="return false" target="_blank">超省新代驾</a>
        </div>
    </div>
</div>