From 48dcf2c7f01de5078f6a7f94dbc59400100e9ab6 Mon Sep 17 00:00:00 2001 From: xyc <jc_xiong@hotmail.com> Date: 星期三, 23 十月 2024 11:05:07 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml index 85de5ba..6355eb0 100644 --- a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml +++ b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml @@ -161,7 +161,7 @@ a.name, a.product_type, a.name_path, - a.same_sb_name, + b.basic_unit_num as sameSbNum, a.equip_type, b.reliab_distrib_type, b.basic_join_compute, -- Gitblit v1.9.1