Merge remote-tracking branch 'origin/dev' into dev

xuhy

7 天以前 bd1e1c6a99c228ece8ece17be462b81d5494c7a1

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

@@ -122,6 +122,10 @@
    @TableField(exist = false)
    private Integer useCount;

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



}