Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-26 15e31c6e6550f9e8bf6fb1df5ca5ad4cc726b64f

 user-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/GetAllRoleAndMenuByConditionPageDto.java

ÎļþÃû´Ó laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/GetAllRoleAndMenuByConditionPageDto.java ÐÞ¸Ä
@@ -13,6 +13,7 @@
@Data
@ApiModel(value = "GetAllRoleAndMenuByConditionPageDto对象", description = "")
public class GetAllRoleAndMenuByConditionPageDto implements Serializable {

    @ApiModelProperty(value = "当前页", example = "1", required = true)
    private Long currentPage;
    @ApiModelProperty(value = "每页多少条", required = true)