ERP_override.git

			@@ -114,16 +114,18 @@
			<!-- <artifactId>spring-boot-starter-websocket</artifactId>-->
			<!-- </dependency>-->

			<!--
			<dependency>
			<groupId>io.netty</groupId>
			<artifactId>netty-all</artifactId>
			<version>4.1.36.Final</version>
			</dependency>
			-->

			<dependency>
			<groupId>com.alibaba</groupId>
			<artifactId>fastjson</artifactId>
			<version>1.2.24</version>
			<version>1.2.83</version>
			</dependency>

			<dependency>
			@@ -155,7 +157,48 @@
			<version>5.14.2</version>
			</dependency>

			<dependency>
			<groupId>org.hibernate.validator</groupId>
			<artifactId>hibernate-validator</artifactId>
			<version>6.1.5.Final</version>
			</dependency>

			<dependency>
			<groupId>com.example</groupId>
			<artifactId>lib</artifactId>
			<version>21.11</version>
			<scope>system</scope>
			<systemPath>${pom.basedir}/src/main/resources/lib/aspose-cad-21.11.jar</systemPath>
			</dependency>

			<!--redis-->
			<dependency>
			<groupId>org.springframework.boot</groupId>
			<artifactId>spring-boot-starter-data-redis</artifactId>
			<version>2.5.9</version>
			</dependency>
			<!--redis连接池依赖-->
			<dependency>
			<groupId>org.apache.commons</groupId>
			<artifactId>commons-pool2</artifactId>
			</dependency>

			<!--jackson json工具-->
			<dependency>
			<groupId>com.fasterxml.jackson.core</groupId>
			<artifactId>jackson-databind</artifactId>
			<version>2.12.6</version>
			</dependency>

			<dependency>
			<groupId>com.fasterxml.jackson.datatype</groupId>
			<artifactId>jackson-datatype-jsr310</artifactId>
			<version>2.12.6</version>
			</dependency>

			</dependencies>



			<build>
			<plugins>
			@@ -163,6 +206,7 @@
			<groupId>org.springframework.boot</groupId>
			<artifactId>spring-boot-maven-plugin</artifactId>
			<configuration>
			<includeSystemScope>true</includeSystemScope>
			<excludes>
			<exclude>
			<groupId>org.projectlombok</groupId>
			@@ -177,12 +221,8 @@

			<!-- <repositories>-->
			<!-- <repository>-->
			<!-- <id>nexus-aliyun</id>-->
			<!-- <name>nexus-aliyun</name>-->
			<!-- <url>http://maven.aliyun.com/nexus/content/groups/public/</url>-->
			<!-- <releases>-->
			<!-- <enabled>true</enabled>-->
			<!-- </releases>-->
			<!-- <id>aspose-maven-repository</id>-->
			<!-- <url>https://releases.aspose.com/java/repo</url>-->
			<!-- <snapshots>-->
			<!-- <enabled>false</enabled>-->
			<!-- </snapshots>-->
			@@ -202,4 +242,4 @@
			<!-- </snapshots>-->
			<!-- </pluginRepository>-->
			<!-- </pluginRepositories>-->
			</project>
			</project>