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

tangzy

2021-08-13 b36986a85b17c94b65e0fd5f9f5c860780738338

 src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml

@@ -15,7 +15,7 @@
    <!--派遣记录分页数据-->
    <select id="selectDispatcherPage" resultType="org.springblade.modules.dispatcher.vo.DispatcherVO">
        select
            sd.*,sdu.name dispatcherCompany
            sd.*,sd.name securityName,sdu.name dispatcherCompany
        from
            sys_dispatcher sd
        left join