Merge branch 'haucheng_panzhihua' into huacheng_test

zhaozhengjie

2022-09-17 fe1a0613d48e9b76b474d22073e72feda23b0d5c

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

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

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