From 3128a684d6654131f01472ee95aa3f09a9d12dac Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 26 三月 2025 14:24:50 +0800
Subject: [PATCH] 1、git同步冲突引起文件丢失,进行系统恢复,并屏蔽一个非git提交的模块; 2、增加文件《增加一个单位(orgTag)》。

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDictItemMapper.xml |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDictItemMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDictItemMapper.xml
index 626c080..957e209 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDictItemMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDictItemMapper.xml
@@ -192,7 +192,9 @@
   <!--鏍规嵁瀛楀吀Code鑾峰彇瀛楀吀椤�-->
   <select id="getDictItemsByDictCode" resultType="com.dy.pipIrrGlobal.voBa.VoDictItem">
     SELECT
-       name, value
+        id AS dictItemId,
+        name,
+        value
     FROM ba_dict_item
     WHERE deleted = 0 AND status = 1 AND dict_code = #{dictCode}
     ORDER BY sort

--
Gitblit v1.8.0