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/resources/mapper/system/MerchantMapper.xml |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/oying-system/src/main/resources/mapper/system/MerchantsMapper.xml b/oying-system/src/main/resources/mapper/system/MerchantMapper.xml
similarity index 73%
rename from oying-system/src/main/resources/mapper/system/MerchantsMapper.xml
rename to oying-system/src/main/resources/mapper/system/MerchantMapper.xml
index 526dea8..1c9d082 100644
--- a/oying-system/src/main/resources/mapper/system/MerchantsMapper.xml
+++ b/oying-system/src/main/resources/mapper/system/MerchantMapper.xml
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.oying.modules.system.mapper.MerchantsMapper">
-    <resultMap id="BaseResultMap" type="com.oying.modules.system.domain.Merchants">
-        <id column="merchants_id" property="merchantsId"/>
+<mapper namespace="com.oying.modules.system.mapper.MerchantMapper">
+    <resultMap id="BaseResultMap" type="com.oying.modules.system.domain.Merchant">
+        <id column="merchant_id" property="merchantId"/>
         <result column="merchant_name" property="merchantName"/>
         <result column="merchant_code" property="merchantCode"/>
         <result column="business_license" property="businessLicense"/>
         <result column="business_license_path" property="businessLicensePath"/>
         <result column="contact_mobile" property="contactMobile"/>
-        <result column="merchants_sort" property="merchantsSort"/>
+        <result column="merchant_sort" property="merchantSort"/>
         <result column="enabled" property="enabled"/>
         <result column="create_by" property="createBy"/>
         <result column="update_by" property="updateBy"/>
         <result column="create_time" property="createTime"/>
         <result column="update_time" property="updateTime"/>
-        <result column="auth_user" property="authUser"/>
-        <result column="auth_time" property="authTime"/>
-        <result column="auth_message" property="authMessage"/>
+        <result column="audit_user" property="auditUser"/>
+        <result column="audit_time" property="auditTime"/>
+        <result column="audit_message" property="auditMessage"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-        merchants_id, merchant_name, merchant_code, business_license, business_license_path, contact_mobile, merchants_sort, enabled, create_by, update_by, create_time, update_time, auth_user, auth_time, auth_message
+        merchant_id, merchant_name, merchant_code, business_license, business_license_path, contact_mobile, merchant_sort, enabled, create_by, update_by, create_time, update_time, audit_user, audit_time, audit_message
     </sql>
 
     <select id="findAll" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
-        from sys_merchants
+        from sys_merchant
         <where>
             <if test="criteria.blurry != null and criteria.blurry != ''">
                 and (
@@ -43,6 +43,6 @@
                 AND create_time BETWEEN #{criteria.createTime[0]} AND #{criteria.createTime[1]}
             </if>
         </where>
-        order by merchants_sort desc
+        order by merchant_sort desc
     </select>
 </mapper>

--
Gitblit v1.9.3