Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-29 88d2eb6e628bd74818690a8f47198d55004c4921

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