Merge branch 'master' of https://sinanoaq.cn:8888/r/swspkmas into zf1

zf

2024-02-01 3450525681e6e290d80ee5d27d0aaca395b62c8f

 exam-system/src/main/resources/mapper/noncoalmine/TrainingInstitutionMapper.xml

@@ -18,7 +18,7 @@
        <if test="query.districtCode != null and query.districtCode != ''">
            AND d.`code` LIKE concat(#{query.districtCode}, '%')
        </if>
        <if test="query.isCm != null and query.isCm != ''">
        <if test="query.isCm != null">
            AND t.is_cm = #{query.isCm}
        </if>
        order by t.create_time desc