code-image-backup-public/lilishop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

'代码合并'

Browse Source
This commit is contained in:
fengtianyangyang
2022-03-03 17:22:13 +08:00
parent f14efa2612 ae0c4aea12
commit 441cb6ddcb
42 changed files with 1357 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
admin/pom.xml
View File

@@ -32,10 +32,17 @@
<artifactId>logstash-logback-encoder</artifactId>
<version>${logstash-logback-encoder}</version>
</dependency>
<<<<<<< HEAD
<!-- <dependency>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter-mail</artifactId>-->
<!-- </dependency> -->
=======
<!-- <dependency>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter-mail</artifactId>-->
<!-- </dependency> -->
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
</dependencies>
<build>
@@ -47,4 +54,8 @@
</plugins>
</build>
</project>
<<<<<<< HEAD
</project>
=======
</project>
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7