Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

jiangqs

2023-07-23 3fd5b6267e4468f179d1f339fee961b89cea7afa

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerOrderPageDto.java

@@ -25,4 +25,12 @@
    @ApiModelProperty(value = "1.全部2.待核销3.已核销")
    private Integer type;

    @ApiModelProperty(value = "订单开始时间")
    private String startOrderDate;

    @ApiModelProperty(value = "订单结束时间")
    private String endOrderDate;

    @ApiModelProperty(value = "订单来源1.店铺商品2.平台秒杀活动3.线下创建")
    private Integer orderFrom;
}