Merge remote-tracking branch 'origin/master'

CBin

2023-08-02 88b0f7ea048e9b201af0bc390f3da8840b11c899

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

@@ -19,6 +19,9 @@
public class MgtActivityOrderPageVo {


    @ApiModelProperty(value="订单id")
    private String orderId;

    @Excel(name = "订单编号", width = 30)
    @ApiModelProperty(value="订单编号")
    private String orderNo;