Merge remote-tracking branch 'origin/master'

luodangjia

2024-08-22 95a9cddb0f20fee1cf01098846c795f4e80131ef

 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;

}