Merge remote-tracking branch 'origin/master'

xuhy

3 天以前 72aaf45389cd09c206ee1b90f0c7f5bf59782930

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