Files
hsweb-framework/hsweb-authorization/hsweb-authorization-basic/src
zhouhao f89befb011 Merge remote-tracking branch 'origin/master' into spring-boot3
# Conflicts:
#	hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/define/DefaultBasicAuthorizeDefinition.java
#	hsweb-commons/hsweb-commons-crud/src/main/resources/i18n/commons/messages_en.properties
#	hsweb-commons/hsweb-commons-crud/src/main/resources/i18n/commons/messages_zh.properties
#	hsweb-core/src/main/java/org/hswebframework/web/i18n/LocaleUtils.java
#	hsweb-system/hsweb-system-dictionary/src/main/java/org/hswebframework/web/dictionary/entity/DictionaryEntity.java
2025-01-21 15:37:23 +08:00
..