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

xiaoyong931011

2022-06-16 bec7abc34ffb9a9de3f5d225bf233a311ff68938

 src/main/java/cc/mrbird/febs/mall/dto/AddMallGoodsDto.java

@@ -71,4 +71,13 @@
     * 是否普通商品 1-普通商品 2-套餐
     */
    private Integer isNormal;

    private BigDecimal score;

    private Integer goodsType;

    private Integer hasCarriage;

    private BigDecimal carriage;

}