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

huanghongfa

2021-10-22 3389e27613953cf3d7d06653139bf902e08736dc

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

@@ -16,6 +16,6 @@
    @ApiModelProperty(value = "订单号")
    private String orderNo;

    @ApiModelProperty(value = "订单号",hidden = true)
    @ApiModelProperty(value = "订单号", hidden = true)
    private String openId;
}