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

peng

5 天以前 bdf04af3958fb7a61f3180aa1efb795ba8ac00d2

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