Merge remote-tracking branch 'origin/main'

# Conflicts:
#	pom.xml
This commit is contained in:
zhouz
2026-07-17 09:30:06 +08:00
176 changed files with 23655 additions and 85 deletions

View File

@@ -19,6 +19,7 @@
<module>nl-module-lms</module>
<module>nl-module-base</module>
<module>nl-module-wms</module>
<module>nl-module-task</module>
<!-- <module>nl-module-member</module>-->
<!-- <module>nl-module-bpm</module>-->
<!-- <module>nl-module-pay</module>-->
@@ -33,8 +34,7 @@
</modules>
<name>${project.artifactId}</name>
<description>芋道项目基础脚手架</description>
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<description>诺力项目基础脚手架</description>
<properties>
<revision>2026.06-SNAPSHOT</revision>