Merge remote-tracking branch 'origin/master'

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleDto.java

@@ -30,7 +30,7 @@ import java.util.Set;
 @Setter
 public class RoleDto extends BaseDTO implements Serializable {
 
-    private Long id;
+    private String id;
 
     private String roleKey;