Merge remote-tracking branch 'origin/master'

maven

2025-09-28 54aff4794f199c40323e8704f660819b73fea768

Merge remote-tracking branch 'origin/master'

 basic-server/src/main/resources/mapper/StandardTreeMapper.xml

@@ -90,7 +90,7 @@
    </sql>

    <select id="selectStandardTreeList" resultMap="FactoryDto">
        select '中天科技检测中心'        factory,
        select '工厂'        factory,
               l.laboratory_name laboratory,
               sto.specimen_name sample_type,
               p.name            sample,
@@ -156,7 +156,7 @@
    </select>

    <select id="selectStandardTreeList2" resultType="com.ruoyi.basic.pojo.StandardTree">
        select '中天科技检测中心'        factory,
        select '工厂'        factory,
               l.laboratory_name laboratory,
               sto.specimen_name sample_type,
               p.name            sample
@@ -237,7 +237,7 @@
        where name = #{name}
    </select>
    <select id="selectStandardTreeListByPartNo" resultMap="FactoryDto">
        select '中天科技检测中心' factory,
        select '工厂' factory,
               l.laboratory_name  laboratory,
               sto.specimen_name  sample_type,
               p.name             sample,