Merge branch 'local_20221014' into huacheng_test

yanghui

2022-10-20 8a7e0adf1e55d32e655ed560211270d75cce8b9d

 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