From 25a977a6408fe6ba20ddacf6f43bee2fe93eb17b Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Tue, 05 Sep 2023 08:41:00 +0800 Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb --- screen-api/src/main/resources/mapper/OrganizationMapper.xml | 44 +++++++++++++++++++++++--------------------- 1 files changed, 23 insertions(+), 21 deletions(-) diff --git a/screen-api/src/main/resources/mapper/OrganizationMapper.xml b/screen-api/src/main/resources/mapper/OrganizationMapper.xml index de7e2ec..e6490b9 100644 --- a/screen-api/src/main/resources/mapper/OrganizationMapper.xml +++ b/screen-api/src/main/resources/mapper/OrganizationMapper.xml @@ -2,26 +2,28 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.moral.api.mapper.OrganizationMapper"> - <!-- ������������������������ --> - <resultMap id="BaseResultMap" type="com.moral.api.entity.Organization"> - <id column="id" property="id" /> - <result column="parent_id" property="parentId" /> - <result column="admin_user_id" property="adminUserId" /> - <result column="name" property="name" /> - <result column="province_code" property="provinceCode" /> - <result column="city_code" property="cityCode" /> - <result column="area_code" property="areaCode" /> - <result column="town_code" property="townCode" /> - <result column="village_code" property="villageCode" /> - <result column="location_level" property="locationLevel" /> - <result column="address" property="address" /> - <result column="phone" property="phone" /> - <result column="email" property="email" /> - <result column="wechat" property="wechat" /> - <result column="create_time" property="createTime" /> - <result column="update_time" property="updateTime" /> - <result column="expire_time" property="expireTime" /> - <result column="is_delete" property="isDelete" /> - </resultMap> + <!-- ������������������������ --> + <resultMap id="BaseResultMap" type="com.moral.api.entity.Organization"> + <id column="id" property="id"/> + <result column="parent_id" property="parentId"/> + <result column="admin_user_id" property="adminUserId"/> + <result column="name" property="name"/> + <result column="province_code" property="provinceCode"/> + <result column="province_name" property="provinceName"/> + <result column="city_code" property="cityCode"/> + <result column="city_name" property="cityName"/> + <result column="area_code" property="areaCode"/> + <result column="area_name" property="areaName"/> + <result column="location_level_code" property="locationLevelCode"/> + <result column="location_level_name" property="locationLevelName"/> + <result column="address" property="address"/> + <result column="phone" property="phone"/> + <result column="email" property="email"/> + <result column="wechat" property="wechat"/> + <result column="create_time" property="createTime"/> + <result column="update_time" property="updateTime"/> + <result column="expire_time" property="expireTime"/> + <result column="is_delete" property="isDelete"/> + </resultMap> </mapper> \ No newline at end of file -- Gitblit v1.8.0