Merge remote-tracking branch 'origin/master'

xuhy

2024-09-10 5a1e5f522d854c1c7c4050da6f1972ef266ad5d4

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderTimeVO.java

@@ -31,4 +31,6 @@
    private String electronicProportion;
    @ApiModelProperty(value = "列表数据")
    private PageInfo<ChargingOrderListVO> list;
    @ApiModelProperty(value = "导出列表数据")
    private List<ChargingOrderListVO> exportList;
}