From ff7234ac1fefe573ae3f03667a748e3351ee6b1b Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 11 May 2023 20:44:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml
index 5126c76..519555b 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml
@@ -11,7 +11,7 @@
</if>
</select>
<select id="getListByRegion" resultType="cn.gistack.sm.sjztmd.entity.AttResBase">
- SELECT "code","name","ad_guid" FROM "att_res_base"
+ SELECT "guid","code","name","ad_guid","eng_scal" FROM "att_res_base"
WHERE "is_deleted"=0
AND "ad_guid" LIKE CONCAT('%',#{obj.code},'%')
<if test="obj.name !=null and obj.name !=''">
@@ -19,7 +19,7 @@
</if>
</select>
<select id="getDetailByCode" resultType="cn.gistack.sm.sjztmd.entity.AttResBase">
- SELECT "code","name","ad_guid" FROM "att_res_base"
+ SELECT "code","name","ad_guid","guid" FROM "att_res_base"
WHERE "is_deleted"=0 and "code" = #{code}
</select>
--
Gitblit v1.9.3