Merge branch 'dev' into send_coupon

peng

3 天以前 11079cf5c81a047c3a343581a5cc6001fb4a2ec8

 framework/src/main/java/cn/lili/modules/lmk/domain/entity/VideoGoods.java

@@ -31,6 +31,10 @@
    /** 商品id */
    private String goodsId;

    @TableField("goods_sku_id")
    /** 商品sku id */
    private String goodsSkuId;

    @TableField("order_num")
    /** 排序 */
    private Integer orderNum;