Merge remote-tracking branch 'origin/master'

xuhy

2024-10-14 e9f36d42efaa757c7f93b00ba3ff9fb0d0bf46c9

 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;