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

huliguo

4 天以前 b646898adf3f2ad119dd9fd1c7c01d7f0742bf97

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

@@ -17,6 +17,9 @@
    @ApiModelProperty(value = "关键词")
    private String keyword;

    @ApiModelProperty(value = "订单来源 1.商城2.秒杀活动3.线下创建4.抽奖5.美团6.抖音7.快手")
    private Integer orderFrom;

    @ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成")
    private Integer orderStatus;