Merge remote-tracking branch 'origin/master'

zengh

2022-03-03 bc493033ebc2ab2bea86626f3cc66727cb993b7e

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

@@ -192,7 +192,7 @@

            (select
                bu.id,
            REVERSE(left(REVERSE(dept_id),LOCATE(',',REVERSE('dept_id'))-1)) as parent_id,
            REVERSE(left(REVERSE(dept_id),LOCATE(',',REVERSE(dept_id))-1)) as parent_id,
                real_name AS title,
                bu.id AS "value",
                bu.id AS "key",