11 Commits

Author	SHA1	Message	Date
JEECG	c9f5bb4409	【3.7.3 版本合并升级】 ... Merge remote-tracking branch 'origin/springboot3' into springboot3_sas # Conflicts: # jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java # jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java # jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java # jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantPackServiceImpl.java # jeecgboot-vue3/package.json	2025-02-24 18:24:51 +08:00
JEECG	7e15e81218	版本合并，升级springboot3分支到3.7.3	2025-02-20 17:56:16 +08:00
JEECG	b8ef121fe7	升级版本号3.7.3	2025-02-07 16:52:19 +08:00
JEECG	1c3b9a10f1	新版发布，升级3.7.2版本号	2024-12-09 17:07:38 +08:00
JEECG	fdb05443c2	【版本合并】springboot3 sas升级到3.7.1	2024-10-10 22:48:10 +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	17c68f6d53	3.7.1版本发布	2024-09-10 15:39:32 +08:00
JEECG	96ab98ac3e	Merge remote-tracking branch 'origin/springboot3' into springboot3_sas ... # Conflicts: # jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgCaptchaException.java # jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/JwtToken.java # jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java # jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java # jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/CustomShiroFilterFactoryBean.java # jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java # jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/ResourceCheckFilter.java # jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/vo/Shiro.java	2024-06-23 10:29:34 +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