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

zxl

3 天以前 f3ccf81a4f203dd0d8957bab15c491cb2181e071

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

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

    private String nickName;

    private String memberId;
}