Merge branch 'master' of ssh://120.76.84.145:20202/java/HongRuiTang into ma...

jiangqs

2023-09-01 dfe810a2108e479c4ed4f8d24dd181140afd8730

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

@@ -24,6 +24,9 @@
    @ApiModelProperty(value = "订单id")
    private String orderId;

    @ApiModelProperty(value="活动id")
    private String activityId;

    @ApiModelProperty(value="订单编号")
    private String orderNo;