合并代码

puzhibing

2024-08-28 1ec6a8d3fd2878b49302d7ab0022d2e9f5b08fb7

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