Merge remote-tracking branch 'remotes/origin/sanshuohuitang_dev' into huach...

manailin

2022-09-29 c469e76e0c3eb803e7d190d105457224969c0bb4

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