Merge branch 'master' into master-test

ANDRU-PC\Andru

2023-07-06 96a3439306a4e7e3743f0d1c4b6253690f7fdf6c

 phis-feign/src/main/java/com/hz/his/dto/PageDto.java

@@ -1,10 +1,15 @@
package com.hz.his.dto;


import lombok.Data;

/**
 * @author ChenJiaHe
 * 分页扩展类*/
@Data
public class PageDto {
    /**标识*/
    private String id;
    /**当前页数*/
    private Integer pageNum;
    /**当前页显示条数*/