合并代码

puzhibing

2024-08-19 48c9592f2dfa35c91c0204e307b21e9f8d104507

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

@@ -39,8 +39,8 @@
    private Integer standardCondition;

    @ApiModelProperty(value = "达标条件值JSON（{\"day\":1,\"times\":5}）")
    @TableField("condition")
    private String condition;
    @TableField("conditions")
    private String conditions;



@@ -49,6 +49,10 @@
    @TableField(exist = false)
    private Long count;

    @ApiModelProperty(value = "前端展示用")
    @TableField("type")
    private Integer type;



}