Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-10-09 06ceee5a4f820ebb19dd66388c958d8638fa1b54

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

@@ -27,7 +27,7 @@
     * 活动id
     */
    @ApiModelProperty(value = "活动id")
    private Long acctivityId;
    private Long activityId;

    /**
     * 订单id