Merge remote-tracking branch 'origin/dev' into dev

peng

4 天以前 1fdfb56613adca09a0ddf39289b41f96fa335a01

 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;