Merge branch '20210406-maqv2' into 20210412-youhua

linzhijie

2021-04-12 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd

 pom.xml

@@ -254,7 +254,7 @@
         <artifactId>jasypt-spring-boot-starter</artifactId>
         <version>2.0.0</version>
      </dependency>
		

      <!-- 获取系统信息 -->
      <dependency>
         <groupId>com.github.oshi</groupId>
@@ -360,7 +360,6 @@
            <version>13.0</version>
            <scope>compile</scope>
        </dependency>

      <dependency>
         <groupId>com.ots</groupId>
         <artifactId>tai-ots-framework</artifactId>
@@ -369,7 +368,7 @@
         <systemPath>${project.basedir}/jar/tai-ots-framework.jar</systemPath>
      </dependency>

    </dependencies>
   </dependencies>

<!--   <build>-->
<!--      <finalName>${project.artifactId}</finalName>-->