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/ComBatteryCommodityOrderCollageTeamPeopleVo.java

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

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

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