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

huanghongfa

2021-05-19 14590de8e4fb23909f1767a53d1f92007f9bbcc4

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

@@ -15,4 +15,7 @@

    @ApiModelProperty(value = "订单号")
    private String orderNo;

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