Merge remote-tracking branch 'origin/master'

wuzeyu

2024-01-15 835ac4c14a2ae8d17578e2b7bbbaa54d5a12f40a

 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/QueryVo.java

@@ -13,8 +13,10 @@
@Builder
@Schema(name = "角色查询条件")
public class QueryVo extends QueryConditionVo {
    @Schema(description = "角色ID")
    public Long roleId;

    @Schema(description = "角色名称")
    public String name;
    public String roleName;
}