Merge remote-tracking branch 'origin/master'

niying

2024-01-29 0cbb588628da7bcdca146420a672916a76df2e0c

 src/main/resources/templates/main.html

@@ -133,8 +133,28 @@
              <li data-src="task/index.shtml"><a  href="#task/index.shtml"><i class="fa fa-circle-o"></i>任务列表</a></li>
              <li data-src="sysConfig/distribute.shtml"><a  href="#sysConfig/distribute.shtml"><i class="fa fa-circle-o"></i>异构系统分发配置</a></li>
          </ul>
        </li>
        <li class="active treeview menu-open">
          <a href="#">
            <i class="fa fa-dashboard"></i> <span>日志管理</span>
            <span class="pull-right-container">
              <i class="fa fa-angle-left pull-right"></i>
            </span>
          </a>
          <ul class="treeview-menu">
              <li data-src="task/cron.shtml"><a  href="#task/cron.shtml"><i class="fa fa-circle-o"></i>表达式生成器</a></li>
            <li data-src="log/listlog.shtml"><a  href="#log/listlog.shtml"><i class="fa fa-circle-o"></i>数据分发日志</a></li>
            <!--<li data-src="sysConfig/distribute.shtml"><a  href="#sysConfig/distribute.shtml"><i class="fa fa-circle-o"></i>异构系统分发配置</a></li>-->
          </ul>
        </li>
        <li class="active treeview menu-open">
          <a href="#">
            <i class="fa fa-dashboard"></i> <span>表达式生成器</span>
            <span class="pull-right-container">
              <i class="fa fa-angle-left pull-right"></i>
            </span>
          </a>
          <ul class="treeview-menu">
            <li data-src="task/cron.shtml"><a  href="#task/cron.shtml"><i class="fa fa-circle-o"></i>表达式生成器</a></li>
          </ul>
        </li>
      </ul>
@@ -144,11 +164,11 @@
  <div class="content-wrapper">
    <section class="content-header">
      <h1>
        Dashboard
        仪表板
      </h1>
      <ol class="breadcrumb">
        <li><a href="main.shtml"><i class="fa fa-dashboard"></i> Home</a></li>
        <li class="active">Dashboard</li>
        <li class="active">仪表板</li>
      </ol>
    </section>
    <!-- 主页 -->