Merge remote-tracking branch 'origin/master'

xuhy

2024-08-22 d2296f646d0eb2dec1f0fa72f02e386e55ccf298

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TGoods.java

@@ -84,8 +84,8 @@
    private Integer underlyingSales;

    @ApiModelProperty(value = "商品描述")
    @TableField("describe")
    private String describe;
    @TableField("describes")
    private String describes;

    @ApiModelProperty(value = "商品介绍")
    @TableField("introduce")