Merge branch 'master' of http://192.168.0.105:10010/r/jfptManager

nnnjjj123

2021-01-11 b6ebb7d8e25fa5505494204abbc54da849ca548e

 src/main/java/org/springblade/modules/catalog/mapper/catalogMapper.xml

@@ -15,8 +15,13 @@
        SELECT id,name,pId FROM `sys_catalog`
    </select>

    <select id="selectCatalogEqNUmber" resultType="java.lang.String">
        SELECT GROUP_CONCAT(eqid) FROM sys_catalog WHERE pId=#{pid} and eqid is NOT NULL;
    <select id="selectCatalogEqNUmber" resultType="java.util.HashMap">

        SELECT
            *
        FROM
            sys_catalog

    </select>

    <select id="selectCount" resultType="java.util.HashMap">