From 2e2356dd4fec268f6be6ed923b14bfa667de0c0d Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期六, 21 六月 2025 16:02:54 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/sd/BasicDataMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/sd/BasicDataMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/BasicDataMapper.xml
index 1764398..18bc20d 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/BasicDataMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/BasicDataMapper.xml
@@ -5,7 +5,7 @@
 <mapper namespace="com.example.erp.mapper.sd.BasicDateMapper">
     <select id="getOrderBasicData">
         select
-            *
+            id,basic_type,if(basic_category='icon',null,nickname) as 'nickname',basic_name,basic_category,create_time,update_time
         from
             basic_data as a
         where a.basic_type=#{type}

--
Gitblit v1.8.0