Merge remote-tracking branch 'origin/master'

# Conflicts:
#	jeecg-boot-module-system/pom.xml
master
周文涛 2 years ago
commit 758dae5f99

@ -8,7 +8,7 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>orc-java</artifactId> <artifactId>jeecg-boot-module-system</artifactId>
<name>jeecg-boot-module-system</name> <name>jeecg-boot-module-system</name>
<repositories> <repositories>
@ -79,7 +79,7 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<configuration> <configuration>
<finalName>orc-java</finalName> <finalName>orc-java-api</finalName>
<mainClass>org.jeecg.JeecgSystemApplication</mainClass> <mainClass>org.jeecg.JeecgSystemApplication</mainClass>
<!--微服务模式下修改为true,跳过此打包插件,否则微服务模块无法引用--> <!--微服务模式下修改为true,跳过此打包插件,否则微服务模块无法引用-->
<skip>false</skip> <skip>false</skip>

Loading…
Cancel
Save