From 43b6ab16ed0480a09dce7b7c5a3ecdfbef3e41a5 Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期六, 04 三月 2023 12:07:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-smoke/src/main/resources/mapper/smoke/OdsCustomerMapper.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ycl-smoke/src/main/resources/mapper/smoke/OdsCustomerMapper.xml b/ycl-smoke/src/main/resources/mapper/smoke/OdsCustomerMapper.xml
index 274b904..c4fa9d6 100644
--- a/ycl-smoke/src/main/resources/mapper/smoke/OdsCustomerMapper.xml
+++ b/ycl-smoke/src/main/resources/mapper/smoke/OdsCustomerMapper.xml
@@ -21,15 +21,15 @@
<result column="logo" property="logo" />
<result column="business_hour" property="businessHour" />
<result column="maintainer_id" property="maintainerId" />
- <result column="area_ids" property="areaIds" />
- <result column="area_id_cascads" property="areaIdCascads" />
- <result column="areas" property="areas" />
- <result column="desc" property="desc" />
+ <result column="area_ids" property="areaIdsString" />
+ <result column="area_id_cascads" property="areaIdCascadsString" />
+ <result column="areas" property="areasString" />
+ <result column="desc1" property="desc" />
</resultMap>
<!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
<sql id="Base_Column_List">
- id, pid, bl_no, bl_name, org, name, contact, mobile, telephone, typ, creator, create_at, status, address, logo, business_hour, maintainer_id, area_ids, area_id_cascads, areas, desc
+ id, pid, bl_no, bl_name, org, name, contact, mobile, telephone, typ, creator, create_at, status, address, logo, business_hour, maintainer_id, area_ids, area_id_cascads, areas, desc1
</sql>
</mapper>
--
Gitblit v1.8.0