Merge remote-tracking branch 'origin/master'

puzhibing

2024-09-10 951cd384e7b81eb7686e303f77992340cc91e6d1

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

@@ -92,8 +92,8 @@
    private String introduce;

    @ApiModelProperty(value = "商品说明")
    @TableField("explain")
    private String explain;
    @TableField("explains")
    private String explains;

    @ApiModelProperty(value = "状态（1=上架，2=下架）")
    @TableField("status")