Merge remote-tracking branch 'origin/master'

aijinhui

2023-11-24 457e566525d57ce0904e00aab9298ab0693ad5a1

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java

@@ -60,9 +60,11 @@
    private Map<String, Object> params;

    @TableField(exist = false)
    @JsonInclude(JsonInclude.Include.NON_DEFAULT )
    private Integer pageNum;

    @TableField(exist = false)
    @JsonInclude(JsonInclude.Include.NON_DEFAULT )
    private Integer pageSize;

    public Integer getPageNum() {