Merge branch 'local_20221024' into huacheng_test

yanghui

2022-11-01 d6f2a3d6c68cc2626b3a1baef7383e66a0f7a58e

 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;
}