Merge branch 'send_coupon' into user_action

peng

2 天以前 e4dd7447aaa4563b9e64a7556710677a140776eb

 framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderExportDTO.java

@@ -87,4 +87,8 @@
    private Date completeTime;
    @ApiModelProperty(value = "店铺")
    private String storeName;

    private String nickName;

    private String memberId;
}