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

Pu Zhibing

2025-06-30 ad87f297e0f5e19b10180eafc4c41802666d754f

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

@@ -44,6 +44,9 @@
    @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
    private Integer goodsType;

    @ApiModelProperty(value = "商品标签")
    private String goodsTag;

    @ApiModelProperty(value = "商品图片")
    private String goodsPicture;