From 206f601b1f2a2e3cb0bf4f5dead01bec9077d8e9 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Thu, 04 Sep 2025 15:28:52 +0800
Subject: [PATCH] Merge branch 'xin' into pxb

---
 oying-system/src/main/resources/mapper/message/MesShopReplyMapper.xml |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/oying-system/src/main/resources/mapper/message/MessageSystemMapper.xml b/oying-system/src/main/resources/mapper/message/MesShopReplyMapper.xml
similarity index 65%
rename from oying-system/src/main/resources/mapper/message/MessageSystemMapper.xml
rename to oying-system/src/main/resources/mapper/message/MesShopReplyMapper.xml
index 8ef7543..f2ec744 100644
--- a/oying-system/src/main/resources/mapper/message/MessageSystemMapper.xml
+++ b/oying-system/src/main/resources/mapper/message/MesShopReplyMapper.xml
@@ -1,24 +1,25 @@
 <?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.message.mapper.MessageSystemMapper">
-    <resultMap id="BaseResultMap" type="com.oying.modules.message.domain.MessageSystem">
+<mapper namespace="com.oying.modules.message.mapper.MesShopReplyMapper">
+    <resultMap id="BaseResultMap" type="com.oying.modules.message.domain.MesShopReply">
         <id column="id" property="id"/>
-        <result column="start_time" property="startTime"/>
-        <result column="end_time" property="endTime"/>
-        <result column="create_time" property="createTime"/>
-        <result column="update_time" property="updateTime"/>
+        <result column="evaluation_id" property="evaluationId"/>
+        <result column="reply_type" property="replyType"/>
+        <result column="content" property="content"/>
         <result column="create_by" property="createBy"/>
+        <result column="create_time" property="createTime"/>
         <result column="update_by" property="updateBy"/>
+        <result column="update_time" property="updateTime"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-        id, start_time, end_time, create_time, update_time, create_by, update_by
+        id, evaluation_id, reply_type, content, create_by, create_time, update_by, update_time
     </sql>
 
     <select id="findAll" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
-        from message_system
+        from mes_shop_reply
         <where>
         </where>
         order by id desc

--
Gitblit v1.9.3