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

lidongdong

2022-10-12 538b74a65dffadbd143a9e7e4218e0d0d91100fa

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryCommodityActivityDto.java

@@ -132,6 +132,10 @@
    @ApiModelProperty(value = "更新人id")
    private Long updateBy;


    /**
     * 商品规格id
     */
    @ApiModelProperty(value = "商品规格id")
    private Long specsId;
}