From a30d166148f0c385562eb748e5a81420b5ba93d6 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 10 Jul 2025 18:05:41 +0800
Subject: [PATCH] 汇旺财下单返回序列化-new

---
 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