EightMonth 06b41ae479 Merge branch 'master' into springboot3 ... # Conflicts: # db/tables_nacos.sql # jeecg-boot-base-core/pom.xml # jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java # jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java # jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFilesController.java # jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleIndexController.java # jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFiles.java # jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java # jeecg-module-system/jeecg-system-start/pom.xml # jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml # jeecg-server-cloud/jeecg-cloud-gateway/pom.xml # jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/pom.xml # pom.xml		2024-03-25 09:39:13 +08:00
..
src/main	Merge branch 'master' into springboot3	2024-03-25 09:39:13 +08:00
pom.xml	【3.6.3版本发布】升级版本号	2024-03-06 17:13:05 +08:00