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

peng

5 天以前 803a61d1d89e75f0b5d72785069b3dceb579f3ca

 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;