Merge remote-tracking branch 'origin/master'

puzhibing

2024-09-24 54b50b89b9f083a892e954a8401a7203af87d4a2

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/InfoCouponDto.java

@@ -15,7 +15,7 @@

    @ApiModelProperty(value = "主键")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;
    private String id;
    @ApiModelProperty(value = "优惠券名称")
    @TableField("name")
    private String name;