Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-26 b4f51073e4a5ac0fc14a2087af339cd39e267f0d

 cloud-server-management/src/main/resources/mapper/CarServiceMapper.xml

@@ -9,14 +9,4 @@
        <result column="type" property="type"/>
        <result column="serverCarModelId" property="serverCarModelId"/>
    </resultMap>


    <select id="query" resultType="CarService">
        select
        id as id,
        carId as carId,
        `type` as `type`,
        serverCarModelId as serverCarModelId
        from t_car_service where `type` = #{type} and carId = #{carId}
    </select>
</mapper>