mirror of
https://github.com/hs-web/hsweb-framework.git
synced 2026-07-01 04:24:50 +08:00
f89befb011
# 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