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

云

12 小时以前 3d556b8defe1ff5b9aeb481bd1d0a67b2ded0192

 src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml

@@ -32,7 +32,7 @@
        <if test="req.serviceType != null">
            and service_type = #{req.serviceType}
        </if>
        order by update_time desc
        order by create_time desc
    </select>
    <select id="countAfterSalesService" resultType="com.ruoyi.aftersalesservice.dto.CountDto">
        select
@@ -42,4 +42,4 @@
        group by status
    </select>

</mapper>
</mapper>