Merge remote-tracking branch 'origin/master-stander-test' into master-xlk-test

cmg

2024-08-06 f8438aef2a886c6f71508d4e606a350757e1d1a8

Merge remote-tracking branch 'origin/master-stander-test' into master-xlk-test

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

@@ -25,6 +25,8 @@
    private List<String> typeIdList;
    /**appid*/
    private String appId;
    /*** 门店ID**/
    private String shopId;

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

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

New file
@@ -0,0 +1,13 @@
package com.hz.his.dto.order;


import lombok.Data;

@Data
public class OrderOtherFilesDto {

    /*** 文件类型 **/
    private String fileType;
    /***  文件路径**/
    private String fileUrl;
}

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

@@ -73,6 +73,9 @@
    /**必填:退费统计类型(RefundRecord)*/
    private String refundStatistics;

    /**是否归还商品 0=否 1=是*/
    private Integer isReturnBack;

    /**备用参数*/
    //总订单领建标识
    private String hisOrderId;

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

@@ -71,5 +71,7 @@
    private String giveIncreaseInfo;
    /**非必填 可以参与积分抵扣结账的商品标识*/
    private List<String> canIntegralCashIdList;
    /**非必填 其他截图或者文件上传 **/
    private List<OrderOtherFilesDto> otherInfoFiles;

}

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

@@ -20,5 +20,7 @@
    /**价格查询 最小价格 最大价格*/
    private String minPrice;
    private String maxPrice;
    /**查询区分 0=项目分类查询 1=诉求分类查询**/
    private Integer searchType;

}