From 7e2117e6e7382d942d5cdbb2ac5d35b7d278a478 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Tue, 03 Jun 2025 01:27:08 +0800
Subject: [PATCH] 重命名

---
 oying-system/src/main/java/com/oying/modules/system/domain/Merchant.java |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/system/domain/Merchants.java b/oying-system/src/main/java/com/oying/modules/system/domain/Merchant.java
similarity index 80%
rename from oying-system/src/main/java/com/oying/modules/system/domain/Merchants.java
rename to oying-system/src/main/java/com/oying/modules/system/domain/Merchant.java
index 139f7b5..5660ada 100644
--- a/oying-system/src/main/java/com/oying/modules/system/domain/Merchants.java
+++ b/oying-system/src/main/java/com/oying/modules/system/domain/Merchant.java
@@ -20,12 +20,12 @@
 **/
 @Getter
 @Setter
-@TableName("sys_merchants")
-public class Merchants extends BaseEntity implements Serializable {
+@TableName("sys_merchant")
+public class Merchant extends BaseEntity implements Serializable {
 
-    @TableId(value = "merchants_id", type = IdType.AUTO)
+    @TableId(value = "merchant_id", type = IdType.AUTO)
     @ApiModelProperty(value = "ID")
-    private Long merchantsId;
+    private Long merchantId;
 
     @NotBlank
     @ApiModelProperty(value = "名称")
@@ -48,21 +48,21 @@
     private String contactMobile;
 
     @ApiModelProperty(value = "排序")
-    private Integer merchantsSort;
+    private Integer merchantSort;
 
     @ApiModelProperty(value = "状态")
     private String enabled = "1";
 
     @ApiModelProperty(value = "审核人")
-    private String authUser;
+    private String auditUser;
 
     @ApiModelProperty(value = "审核时间")
-    private Timestamp authTime;
+    private Timestamp auditTime;
 
     @ApiModelProperty(value = "审核信息")
-    private String authMessage;
+    private String auditMessage;
 
-    public void copy(Merchants source){
+    public void copy(Merchant source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }
 }

--
Gitblit v1.9.3