Merge branch '20210406-maqv2' into 20210412-youhua

linzhijie

2021-04-12 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd

 src/main/resources/templates/monitor/job/jobLog.html

@@ -48,7 +48,8 @@
               <a class="btn btn-danger" onclick="$.operate.clean()" shiro:hasPermission="monitor:job:remove">
                   <i class="fa fa-trash"></i> [[#{basis.clear}]]
               </a>
               <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="monitor:job:export">
               <a style="background-color: #a87242;border-color: #a87242;color: #FFFFFF"
                class="btn" onclick="$.table.exportExcel()" shiro:hasPermission="monitor:job:export">
                  <i class="fa fa-download"></i> [[#{basis.export}]]
              </a>
           </div>