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

huanghongfa

2022-04-14 cb2b53c615599ae0ca50fbdaa2de83be047c94fe

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

@@ -2,6 +2,7 @@

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
@@ -86,4 +87,6 @@
    @ApiModelProperty(value = "创建人id")
    private Long createBy;

    @ApiModelProperty(value = "好友帮砍价记录列表")
    private List<ComBatteryCommodityOrderBargainRecordVo> orderBargainRecordList;
}