root/hl_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/sanxian_acs_1213' into feature/sanxianacs1213

Browse Source 
# Conflicts:
#	wcs/nladmin-system/src/main/java/org/nl/modules/loki/service/impl/LokiServiceImpl.java
#	wcs/nladmin-system/src/main/java/org/nl/modules/lucene/service/impl/LuceneServiceImpl.java
#	wcs/nladmin-system/src/main/resources/config/application-dev.yml
#	wcs/nladmin-system/src/main/resources/config/application-prod.yml
#	wcs/nladmin-system/src/main/resources/config/application-test.yml
#	wcs/nladmin-system/src/main/resources/config/application.yml
#	wcs/nladmin-system/src/main/resources/logback-spring.xml
This commit is contained in:
zhangzq
2024-02-19 17:00:49 +08:00
parent 93185c9bfa 990fcb563a
commit 4afc8d43b2
23 changed files with 1139 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mes/hd/nladmin-system/pom.xml
View File

@@ -251,16 +251,17 @@
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.4.0</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
<version>2.3</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-generator</artifactId>
<version>3.4.0</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
<version>2.3</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>