Merge branch 'local_20221014' into huacheng_test

yanghui

2022-10-20 bddad8b22f9b505274a8c2904d9d81efda89f497

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/WxPayNotifyOrderDTO.java

@@ -25,4 +25,7 @@

    @ApiModelProperty(value = "支付返回参数信息")
    private String result;

    @ApiModelProperty(value = "支付附加数据")
    private String attach;
}