Merge remote-tracking branch 'origin/master'

xuhy

2024-08-22 1e4b4f686f4462786c75b9a9f2cd59f29d8b2140

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

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



    @ApiModelProperty(value = "销量")
    @TableField(exist = false)
    private Integer salesCount;
    @ApiModelProperty(value = "1商品2优惠卷")
    @TableField(exist = false)
    private Integer goodType;

}