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

fhx

2023-08-08 ad4edbbf6ad2f20df3c21e60798ea649a47289ff

 phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrPayResponeVo.java

File was renamed from phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrResponeVo.java
@@ -7,7 +7,7 @@
 * @author CJH
 */
@Data
public class OrderQrResponeVo {
public class OrderQrPayResponeVo {

    /**商户号-Y-32（商户在招行完成商户进件后分配的招行商户号）*/
    private String merId;