Skip to content

J
jz-dmp-service
Commit 2a15ea73 authored by sml's avatar sml
Browse files
Options

冲突解决

parent c5ad9296
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
pom.xml
View file @ 2a15ea73
...@@ -69,6 +69,10 @@ ...@@ -69,6 +69,10 @@
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-freemarker</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId> <artifactId>spring-boot-configuration-processor</artifactId>
......
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