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

huliguo

昨天 a966dafb8877552267a94fe8c544c5ea72cf5650

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerConsumerGoodsListVo.java

@@ -51,4 +51,7 @@

    @ApiModelProperty(value="待确认次数")
    private Integer sureNum;
    
    @ApiModelProperty(value = "是否选中")
    private Boolean optionFlag;
}