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

Pu Zhibing

2025-07-01 64264bb278bbfaa8df29f5f19a59d4e8345b04aa

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/StaffPageDto.java

@@ -7,7 +7,9 @@
 * @author cheny
 */
@Data
public class StaffPageDto {
public class StaffPageDto extends StaffBaseDto{


    @ApiModelProperty(name = "pagenum", value = "页码")
    private Integer pageNum = 1;