Merge branch 'master-base' into master-test

fhx

2024-08-02 bc798685f11aeec95e64c25b0a4594d8876d881d

 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){