修改冲突

puzhibing

2024-08-17 ffae18d7a8e21b93bc837d889504d2c8b55368c0

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

@@ -100,6 +100,8 @@
    private Integer status;



    @ApiModelProperty(value = "销量")
    @TableField(exist = false)
    private Integer salesCount;

}