Merge branch 'dev' into send_coupon

peng

3 天以前 11079cf5c81a047c3a343581a5cc6001fb4a2ec8

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

@@ -26,6 +26,11 @@
    /** 订单id */
    private String orderId;


    @TableField("item_order_id")
    /** 订单id */
    private String itemOrderId;

    @TableField("goods_id")
    /** 商品id */
    private String goodsId;