Merge branch 'dev' into send_coupon

peng

4 天以前 11079cf5c81a047c3a343581a5cc6001fb4a2ec8

 framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java

@@ -185,6 +185,12 @@
     */
    @ApiModelProperty(value = "订单类型")
    private String orderType;

    /**
     * @see CouPonFlagEnum
     */
    @ApiModelProperty(value = "是否是礼品卡")
    private String couponFlag;
    /**
     * 订单地址修改状态
     */