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

peng

6 天以前 904812187f2fb4eafc9071458f3a91d3f7b7748a

 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;
}