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

yanghui

2022-10-13 f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderVo.java

@@ -222,4 +222,10 @@

    @ApiModelProperty(value = "商品规格图片")
    private String commodityImages;

    @ApiModelProperty(value = "收货地区编码")
    private String receivingRegionCode;

    @ApiModelProperty(value = "用户昵称")
    private String nickName;
}