Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-21 c5f9d214b2d63506cfbab5cc977610da3b133ec4

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

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

    @ApiModelProperty(value = "自提点地址id")
    private Long pointId;

    @ApiModelProperty(value = "订单备注")
    private String remark;