From 3660c62eca4ec4bf3fda22607abdf6d702f06abd Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Tue, 08 Jul 2025 16:34:33 +0800
Subject: [PATCH] 新增主键替代复合主键
---
oying-system/src/main/java/com/oying/modules/system/domain/Merchant.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/system/domain/Merchant.java b/oying-system/src/main/java/com/oying/modules/system/domain/Merchant.java
index dc6525d..3c6a316 100644
--- a/oying-system/src/main/java/com/oying/modules/system/domain/Merchant.java
+++ b/oying-system/src/main/java/com/oying/modules/system/domain/Merchant.java
@@ -54,7 +54,7 @@
private Integer merchantSort;
@ApiModelProperty(value = "状态")
- private String enabled = "1";
+ private String enabled = "0";
@ApiModelProperty(value = "审核人")
private String auditUser;
@@ -67,7 +67,7 @@
@TableField(exist = false)
@ApiModelProperty(value = "用户ID")
- private String userId;
+ private Long userId;
public void copy(Merchant source) {
BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true));
--
Gitblit v1.9.3