Merge branch 'master-xlk' into master-xlk-test

fhx

2024-08-12 a6a950766586db2d274a179904d9b3ea714a3b88

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

@@ -69,5 +69,9 @@
    private String giveIncreaseTitle;
    /**赠送标题（领取记录展示-详情）（不要使用，会删除）*/
    private String giveIncreaseInfo;
    /**非必填 可以参与积分抵扣结账的商品标识*/
    private List<String> canIntegralCashIdList;
    /**非必填 其他截图或者文件上传 **/
    private List<OrderOtherFilesDto> otherInfoFiles;

}