github/JeecgBoot
1
0
Fork 0
mirror of https://github.com/jeecgboot/JeecgBoot.git synced 2026-02-25 12:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,473 Commits 8 Branches 77 Tags
Commit Graph

5 Commits

Author SHA1 Message Date
JEECG
79f7134bd5 【springboot3分支 issues/7353】The bean 'dataSource', defined in class path resource #7353 2024-10-19 19:30:05 +08:00
JEECG
512234a804 【版本合并】 branch 'origin/master' into springboot3 2024-10-08 19:30:14 +08:00
JEECG
17180bfcd5 升级版本号3.7.1 2024-09-10 16:16:44 +08:00
JEECG
7778ede90e Merge remote-tracking branch 'origin/master' into springboot3 
# Conflicts:
#	jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger3Config.java
#	jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/UndertowCustomizer.java
#	jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFilesController.java
#	jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFiles.java
 2024-06-23 10:23:56 +08:00
JEECG
bb918b742e 前端代码和后端代码合并到一个仓库中 2024-06-23 10:09:17 +08:00