Commit 950a1205 authored by 侯力峰's avatar 侯力峰
Browse files

Merge branch 'main' of

https://tydicdata.com/gitlab/spatio/spatiotemporal-web-core.git into
main

Conflicts:
	pom.xml
parents 071f672e 9617face
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId> <artifactId>fastjson</artifactId>
<version>1.2.36</version> <version>2.0.45</version>
</dependency> </dependency>
<!--jwt工具类 --> <!--jwt工具类 -->
...@@ -241,4 +241,4 @@ ...@@ -241,4 +241,4 @@
</plugins> </plugins>
</build> </build>
</project> </project>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment