Merge remote-tracking branch 'origin/master'

xuhy

6 天以前 1ec94c00e5c312818c9e1e3742ca838e60b7e5e7

 ruoyi-system/src/main/java/com/ruoyi/system/model/TSysOrderGoods.java

@@ -33,6 +33,9 @@
    @ApiModelProperty(value = "订单id")
    @TableField("order_id")
    private String orderId;
    @ApiModelProperty(value = "商品id")
    @TableField("goods_id")
    private String goodsId;

    @ApiModelProperty(value = "商品名称")
    @TableField("goods_name")