Merge remote-tracking branch 'origin/master'

xuhy

7 天以前 433bc1e314ecfd483379ca0e2e74e7c815d3261f

 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")