From c5cb162b5cbdb589e97290fba3ac3e9241ec48d4 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期五, 04 八月 2023 15:18:00 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- cloud-server-competition/src/main/java/com/dsh/competition/entity/PaymentCompetition.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/entity/PaymentCompetition.java b/cloud-server-competition/src/main/java/com/dsh/competition/entity/PaymentCompetition.java index 2473805..a8f5187 100644 --- a/cloud-server-competition/src/main/java/com/dsh/competition/entity/PaymentCompetition.java +++ b/cloud-server-competition/src/main/java/com/dsh/competition/entity/PaymentCompetition.java @@ -18,7 +18,7 @@ /** * 主键 */ - @TableId(value = "id", type = IdType.INPUT) + @TableId(value = "id", type = IdType.NONE) private Long id; /** * 业务流水号 @@ -71,6 +71,11 @@ @TableField("refundOrderNo") private String refundOrderNo; /** + * 状态(1=正常,2=冻结,3=删除) + */ + @TableField("state") + private Integer state; + /** * 添加时间 */ @TableField("insertTime") -- Gitblit v1.7.1