Merge branch 'acid_push' into huacheng_test

zhaozhengjie

2022-09-16 f4c8664c2d1c6d6e62f75433a27c5645942d5e85

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