Merge branch 'dev' into send_coupon

peng

昨天 11079cf5c81a047c3a343581a5cc6001fb4a2ec8

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

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

    private String nickName;

    private String memberId;
}