From 6a90f2d1feaf583c211d5f9fe95dff7f7c748ed3 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 06 九月 2024 17:42:20 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/ServerCarModelMapper.xml | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/ServerCarModelMapper.xml b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/ServerCarModelMapper.xml
index 95202f6..925c5a1 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/ServerCarModelMapper.xml
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/ServerCarModelMapper.xml
@@ -6,7 +6,9 @@
<resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.ServerCarModel">
<id column="id" property="id"/>
<result column="type" property="type"/>
- <result column="name" property="name"/>
+ <result column="chineseName" property="chineseName"/>
+ <result column="englishName" property="englishName"/>
+ <result column="frenchName" property="frenchName"/>
<result column="img" property="img"/>
<result column="price" property="price"/>
<result column="state" property="state"/>
@@ -18,7 +20,9 @@
<select id="queryServerCarModel" resultType="map">
select
id as id,
- `name` as `name`,
+ chineseName,
+ englishName,
+ frenchName,
img as img,
price as price
from t_server_carmodel where state = 1 and `type` = #{type}
--
Gitblit v1.7.1