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

huliguo

2025-06-16 a966dafb8877552267a94fe8c544c5ea72cf5650

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

@@ -46,6 +46,9 @@
    @ApiModelProperty(value="商品数量")
    private Integer goodsNum;

    @ApiModelProperty(value="核销商户类型（0=全部店铺，1=部分商户，2=单个商户）")
    private Integer shopNumber;

    @ApiModelProperty(value="商户id")
    private Long shopId;