Merge branch 'local_20221014' into huacheng_test

yanghui

2022-10-21 9ac7984f922a51cc56e663057fb85c937b874dc6

 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;
}