Merge remote-tracking branch 'origin/master'

xuhy

2024-08-17 477be92633089830178b9b98af7a1ffd20e2f8f2

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

@@ -110,7 +110,6 @@
    @ApiModelProperty(value = "说明")
    @TableField("remark")
    private String remark;

    @ApiModelProperty(value = "状态（1=上架，2=下架）")
    @TableField("status")
    private Integer status;