Merge remote-tracking branch 'origin/master'

puzhibing

2024-08-22 1bc9bbff762653151ca80957c3f31ab54a5a42ca

 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;

}