Merge remote-tracking branch 'origin/master'

tangzy

2021-09-15 6a5040680d4fb921b433b9bf7baf59af09baa750

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

@@ -29,6 +29,9 @@
        <if test="dispatcherUnit.province!=null">
            and sdu.province = #{dispatcherUnit.province}
        </if>
        <if test="dispatcherUnit.deptId!=null and dispatcherUnit.deptId!=''">
            and sdu.dept_id = #{dispatcherUnit.deptId}
        </if>
        <if test="dispatcherUnit.city!=null">
            and sdu.city = #{dispatcherUnit.city}
        </if>