Merge remote-tracking branch 'origin/master'

zhanglin8526

2023-05-09 c2d38efe0c2516295abb968442ef765e3da9544d

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

@@ -50,4 +50,7 @@
    @ApiModelProperty(value = "是否绑定商户0否1是")
    private Integer sameShop;

    @ApiModelProperty(value = "核销码")
    private String verifyCode;

}