Merge branch 'dev' into user_action

peng

2025-09-16 2040c0a7fa055174f252aa3880a2506af70850cf

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