Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-22 1f9889666aef211599087ce6dcc4cd6cff3496ad

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

@@ -21,6 +21,9 @@
    @ApiModelProperty(value = "用户手机号",hidden = true)
    private String phone;

    @ApiModelProperty(value = "用户openId",hidden = true)
    private String openId;

    @ApiModelProperty(value = "用户收货地址id",required = true)
    private Long receiverId;