Merge remote-tracking branch 'origin/master'

CBin

2023-08-02 88b0f7ea048e9b201af0bc390f3da8840b11c899

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

@@ -37,6 +37,10 @@
    @ApiModelProperty(value = "用户姓名")
    private String userName;

    @Excel(name = "用户手机", width = 30)
    @ApiModelProperty(value = "用户手机")
    private String userMobile;

    @ApiModelProperty(value="订单商品列表")
    private List<MgtOrderGoodsPageVo> mgtOrderGoodsPageVoList;