Merge remote-tracking branch 'origin/master'

zengh

2022-07-12 63ea601aa950e88237728bf183e30268a3af8616

 src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml

@@ -67,4 +67,8 @@
            and sc.id = #{car.id}
        </if>
    </select>

    <select id="selectCar" resultType="java.util.HashMap">
        SELECT equipment_code as code,car_number as carnumber FROM `sys_car` WHERE equipment_code IS NOT NULL
    </select>
</mapper>