yangjun
/
dbsd_kczx_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.115.223.229:8888/yangjun/dbsd_kczx_java 

# Conflicts:
#	jeecg-module-main/src/main/java/org/jeecg/modules/httpinterface/controller/testController.java
This commit is contained in:
yangjun 2024-10-09 09:17:56 +08:00
parent 0dde5ec824 02672aee11
commit 7c0dae72e3
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jeecg-boot-base-core/pom.xml
View File

@ -257,22 +257,6 @@
<artifactId>jsch</artifactId>
<version>0.1.55</version>
</dependency>
<!-- 引入libreoffice依赖-->
<dependency>
<groupId>org.jodconverter</groupId>
<artifactId>jodconverter-local</artifactId>
<version>${libreoffice.jodconverter-local.version}</version>
</dependency>
<dependency>
<groupId>org.libreoffice</groupId>
<artifactId>ridl</artifactId>
<version>${libreoffice.ridl.version}</version>
</dependency>
<dependency>
<groupId>org.jodconverter</groupId>
<artifactId>jodconverter-spring-boot-starter</artifactId>
<version>${libreoffice.jodconverter-spring-boot-starter.version}</version>
</dependency>
</dependencies>
</project>

16
jeecg-module-main/pom.xml
View File

@ -70,6 +70,22 @@
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
</dependency>
<!-- 引入libreoffice依赖-->
<dependency>
<groupId>org.jodconverter</groupId>
<artifactId>jodconverter-local</artifactId>
<version>${libreoffice.jodconverter-local.version}</version>
</dependency>
<dependency>
<groupId>org.libreoffice</groupId>
<artifactId>ridl</artifactId>
<version>${libreoffice.ridl.version}</version>
</dependency>
<dependency>
<groupId>org.jodconverter</groupId>
<artifactId>jodconverter-spring-boot-starter</artifactId>
<version>${libreoffice.jodconverter-spring-boot-starter.version}</version>
</dependency>
</dependencies>
<build>
<plugins>