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

tangxiaobao

2022-04-14 87f6cce44f87f9df74ef737ea831bed9ceed490c

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

@@ -131,4 +131,10 @@

    @ApiModelProperty(value = "商户名称")
    private String storeName;

    @ApiModelProperty(value = "商户规格id")
    private Long specsId;

    @ApiModelProperty(value = "商户规格名称")
    private Long specsName;
}