Merge branch 'master' into master-test

wangrenhuang

2023-11-06 e6760711ae80d54481d1cb7321e10a3c6f2cb795

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

@@ -30,4 +30,11 @@
     * isDel=101，则phis这边不需要扣减用户积分
     */
    private Integer isDel = 0;

    /**非必填 第三方订单编号*/
    private String otherOrderNo;
    /**非必填 次级订单号或兑换码*/
    private String assistOrderNo;
    /**非必填 OCR识别图片链接*/
    private String ocrImageUrl;
}