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

zxl

5 天以前 e00e10418b01eb0ee442b2dc4029925fba7ae33b

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

@@ -92,4 +92,6 @@
    private String storeName;

    private String nickName;

    private String memberId;
}