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

zxl

5 天以前 d33b041f4b2a63a22682c9b3f344ef35f84b4542

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

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

    private String nickName;

    private String memberId;
}