Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

jiangqs

2023-08-03 cc1181b93c51c60a117846f9640d3f56370e67f3

 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;