解决冲突

beetlsql3-dev
姚丹ab 2 years ago
parent c210c94799
commit 098c423bb1

@ -17,7 +17,7 @@
<label class="layui-form-label">批量导入模板下载:</label> <label class="layui-form-label">批量导入模板下载:</label>
<div class="layui-form-mid layui-word-aux"> <div class="layui-form-mid layui-word-aux">
<a href="${ctxPath}/jlw/student/downloadTemplate.json"> <a href="${ctxPath}/jlw/student/downloadTemplate.json">
<i class="iconfont" style="font-size: 30px;color: #2469f5;">&#xe6f6;</i> <i class="iconfont" style="font-size: 30px;color: #2469f5;">&#xebc7;</i>下载模板
</a> </a>
</div> </div>
</div> </div>
@ -25,7 +25,7 @@
<label class="layui-form-label">上传批量导入文件:</label> <label class="layui-form-label">上传批量导入文件:</label>
<div class="layui-form-mid layui-word-aux"> <div class="layui-form-mid layui-word-aux">
<a id="importTemplate" style="cursor: pointer;"> <a id="importTemplate" style="cursor: pointer;">
<i class="iconfont" style="font-size: 30px;color: #73a2f8;">&#xe60e;</i> <i class="iconfont" style="font-size: 40px;">&#xebb8;</i>
</a> </a>
</div> </div>
</div> </div>

Loading…
Cancel
Save