Merge remote-tracking branch 'origin/master'

jiangping

2024-06-11 fc38ef283d254bc4c6b700cfefcb0a6e65f19ba7

 server/system_service/src/main/java/com/doumee/core/aware/DefaultDataPermissionAware.java

@@ -43,7 +43,7 @@
//                return this.defaultData(loginUserInfo.getId());
//            }
            SystemDataPermission systemDataPermission = new SystemDataPermission();
            systemDataPermission.setType((short)0);
            systemDataPermission.setType(0);
            List<SystemDataPermission> dataPermissions = new ArrayList<>();
            dataPermissions.add(systemDataPermission);
            // 按角色的数据权限优先级返回数据