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

peng

8 天以前 5100e0fe44f260d81b7416d0de46962926709cab

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

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

    private String nickName;
}