Merge branch 'master' into test

CeDo

2021-06-17 1c8ed0e3e18d6ed97879cb2925db914a9d487314

 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;