Merge branch 'master-prod-new' into master-test

fwq

2023-08-04 da53ee87482e45bad633c6391697c675030b4bcf

 phis-feign/src/main/java/com/hz/his/vo/payment/PayNoVo.java

@@ -21,6 +21,9 @@
    /**Y-关联类型标识*/
    private String typeId;

    /**N-支付方式编号（PaymentMethod里面的编号），关联订单的支付方式记录*/
    private String paymentNo;

    /**关联类型-总订单*/
    public static final int TYPE_ORDER = 0;