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

houruijun

2020-11-02 f14deee7baaf82e7aad6fc81a2509ba88e869afd

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysOrganizationMapper.xml

@@ -92,7 +92,7 @@
<!--        </select>-->
    <select id="findListByUserId" resultType="com.kidgrow.common.model.SysOrganization">
         SELECT
            *
            org.*
            FROM
            sys_user_org uo
            LEFT JOIN sys_organization org ON uo.org_id = org.id