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

zxl

5 天以前 61e3917c5b0d667d23430890f45396a9bb7731ac

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

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

    private String nickName;
}