Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test

liyj

2024-10-25 a58d970029971e5253dee52d77ec8a075aa76a53

 dyh-service/dyh-base/src/main/java/cn/huge/module/sys/dto/GridUserRoleDTO.java

@@ -34,4 +34,6 @@

    private boolean lastOrgRole;

    private String orgRoleId;

}