Merge branch 'mall-amz' of http://120.27.238.55:7000/r/xc-mall into mall-amz

xiaoyong931011

2022-06-27 f03a1d7b68997648b15cc6122ce68da9a2e4f672

 src/main/java/cc/mrbird/febs/mall/vo/OrderItemVo.java

@@ -38,4 +38,7 @@

    @ApiModelProperty(value = "1-普通商品 2-套餐")
    private Integer isNormal;

    @ApiModelProperty(value = "商品ID")
    private Long goodsId;
}