Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-13 128532d205e5a8985690c642bd49ee3a6921a57a

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

@@ -115,5 +115,9 @@
    @TableField("person_ids")
    private String personIds;

    @ApiModelProperty(value = "上架状态：0-下架 1-上架")
    @TableField("shelf_status")
    private Integer shelfStatus;


}