From ec1bf4658e36a17f971a54007920a44c5378b7dc Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期一, 16 六月 2025 10:41:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/PermissionStreamNewMapper.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/PermissionStreamNewMapper.xml b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/PermissionStreamNewMapper.xml
index 76f6228..6ebebfa 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/PermissionStreamNewMapper.xml
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/PermissionStreamNewMapper.xml
@@ -4,8 +4,8 @@
<select id="loadProductMix" resultType="org.jeecg.modules.dnc.entity.ProductMix">
SELECT DISTINCT
mix.id,
- mix.tree_code 'code',
- mix.tree_name 'name',
+ mix.tree_code,
+ mix.tree_name,
mix.parent_id,
mix.tree_type AS 'type',
mix.extend,
@@ -31,8 +31,8 @@
</select>
<select id="loadProductMixAll" resultType="org.jeecg.modules.dnc.entity.ProductMix">
SELECT DISTINCT mix.id,
- mix.tree_code 'code',
- mix.tree_name 'name',
+ mix.tree_code,
+ mix.tree_name ,
mix.parent_id,
mix.tree_type AS 'type',
mix.extend,
@@ -92,8 +92,8 @@
)
SELECT DISTINCT
mix.id,
- mix.tree_code 'code',
- mix.tree_name 'name',
+ mix.tree_code,
+ mix.tree_name,
mix.parent_id,
mix.tree_type AS 'type',
mix.extend,
--
Gitblit v1.9.3