diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java index c6c6fbc81..905110f05 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java @@ -83,7 +83,6 @@ public class MybatisPlusConfiguration { */ @Bean @ConditionalOnMissingBean - @ConditionalOnBean(RemoteDataScopeService.class) public DataScopeHandle dataScopeHandle() { return new PigxDefaultDatascopeHandle(); } diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/tenant/tenant.properties b/pigx-upms/pigx-upms-biz/src/main/resources/tenant/tenant.properties index edb2c730c..8d4fba6b5 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/tenant/tenant.properties +++ b/pigx-upms/pigx-upms-biz/src/main/resources/tenant/tenant.properties @@ -1,6 +1,6 @@ # \u79DF\u6237\u521D\u59CB\u5316\u9ED8\u8BA4\u914D\u7F6E defaultUsername=admin defaultPassword=123456 -defaultRoleCode=ROLE_admin +defaultRoleCode=ROLE_ADMIN defaultRoleName=\u79DF\u6237\u9ED8\u8BA4\u89D2\u8272 defaultDeptName=\u79DF\u6237\u9ED8\u8BA4\u90E8\u95E8 \ No newline at end of file