From 8c4bbe846095733960c17905746bc40882a50f88 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 12 十二月 2024 16:40:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TIntegralRule.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TIntegralRule.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TIntegralRule.java
index e0bbbd8..453926a 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TIntegralRule.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TIntegralRule.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,7 +24,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_integral_rule")
@ApiModel(value="TIntegralRule对象", description="")
-public class TIntegralRule implements Serializable {
+public class TIntegralRule {
private static final long serialVersionUID = 1L;
@@ -31,25 +32,28 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "充电得积分{"num1":1}")
+ @ApiModelProperty(value = "充电得积分{\"num1\":1}")
@TableField("charge_credit")
private String chargeCredit;
- @ApiModelProperty(value = "好评得积分{"num1":1}")
+ @ApiModelProperty(value = "好评得积分{\"num1\":1}")
@TableField("credit")
private String credit;
- @ApiModelProperty(value = "添加车辆得积分{"num1":1,"num2":1,"num3":1,"num4":1}")
+ @ApiModelProperty(value = "添加车辆得积分{\"num1\":1,\"num2\":1,\"num3\":1,\"num4\":1}")
@TableField("add_vehicles_earns_points")
private String addVehiclesEarnsPoints;
- @ApiModelProperty(value = "邀请用户得积分{"num1":1}")
+ @ApiModelProperty(value = "邀请用户得积分{\"num1\":1}")
@TableField("invite_users_to_earn_points")
private String inviteUsersToEarnPoints;
- @ApiModelProperty(value = "签到得积分{"num1":1,"num2":[{"num1":1,"num2":1}]}")
+ @ApiModelProperty(value = "签到得积分{\"num1\":1,\"num2\":[\"1(多少天),2（多少分）\"]}")
@TableField("sign_in_for_points")
private String signInForPoints;
+ @ApiModelProperty(value = "是否双倍")
+ @TableField(exist = false)
+ private Integer isDouble;
}
--
Gitblit v1.7.1