Merge branch 'huacheng_test' into haucheng_panzhihua

张天森

2022-12-08 ffb7ccc533993f6b4bfe22353c5ff19f11fa490f

 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