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

peng

4 天以前 40d3bb9fe638a0bd79e829e7fd5114871101390b

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