From c1c7cae9ebaa7f743e51660265c8dfa6ac52f10d Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 09 十月 2025 16:07:42 +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 |    4 ++--
 1 files changed, 2 insertions(+), 2 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..22c22c8 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/BasicDataMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/BasicDataMapper.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.example.erp.mapper.sd.BasicDateMapper">
+<mapper namespace="com.example.erp.mapper.sd.BasicDataMapper">
     <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