Merge branch 'local_20221024' into huacheng_test

yanghui

2022-10-31 c8ffbff633fdf61b76678ff3ca7e1916f59db7ed

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

@@ -61,4 +61,9 @@
    @ApiModelProperty(value = "创建人id")
    private Long createBy;

    @ApiModelProperty(value = "用户头像")
    private String imageUrl;

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