Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-18 17870eeeca47c08244b244c0acb7fe3f3216621f

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