Merge remote-tracking branch 'origin/zypms' into zypms

mrzhssss

2022-01-17 fad10cbd108fa1cb41236ee8d265942e7c1bba56

Merge remote-tracking branch 'origin/zypms' into zypms

 pom.xml

@@ -115,7 +115,7 @@
    </dependencies>

    <build>
        <finalName>wms</finalName>
        <finalName>pms</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>

 src/main/webapp/static/js/common.js

@@ -1,4 +1,4 @@
var baseUrl = "/wms";
var baseUrl = "/pms";

// 详情窗口-高度
var detailHeight = '80%';

 src/main/webapp/views/index.html

@@ -26,7 +26,7 @@
    <div class="layui-header">
      <div class="layui-logo">
          <img src="../static/image/logo2.png"/>
          <cite>&nbsp;Wms&nbsp;Admin&nbsp;</cite>
          <cite>&nbsp;项目管理系统</cite>
      </div>
      <!-- 左 -->
      <ul class="layui-nav layui-layout-left">