Merge branch 'master-prod-new' into master-fwq-团购提前扣取金额

fwq

2024-07-11 1c4be16172a0bda42dc43fbdd49a89ea814701f5

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