Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/OrganizationMapper.xml

@@ -52,7 +52,7 @@
             AND cou.is_delete = 0
             AND cou.biz_org_code LIKE CONCAT( #{bizOrgCode}, '%' )
             ) AS `value`,
-            '驻站消防员' AS name
+            '驻站消防队' AS name
             ) UNION
         (
         SELECT