Merge remote-tracking branch 'origin/master-base' into master-test

chenjiahe

2024-08-01 e74dade001072c3a0e93cd6d698df4df2262f5a3

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

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

    /*** 门店ID**/
    private String shopId;

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