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

peng

8 天以前 fa6528a77821c3fb7a46c2a8b63a2adb6da4fc10

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