Merge branch 'local_20221014' into huacheng_test

yanghui

2022-10-17 a9a660a85f54911a76aefd1eb29a3af0c7b0e419

 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;
}