Merge branch 'master-fwq-爆款活动2.0' into master-test

fwq

2024-07-23 00cfc5c8aae4a252824f5c43f2fb30c508b490eb

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

@@ -23,9 +23,8 @@
    /**分类标识*/
    private String typeId;
    private List<String> typeIdList;
    //appid
    /**appid*/
    private String appId;


    public Integer getPageNum() {
        if(this.pageNum == null || this.pageNum < 0){