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

yanghui

2022-10-21 ef676e6bff9e9fa9d95a8f621e9dbbbdf690e718

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