Merge remote-tracking branch 'origin/master'
This commit is contained in:
		
						commit
						0738c49ea2
					
				| 
						 | 
				
			
			@ -339,7 +339,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 | 
			
		|||
    <select id="getRentDetails" resultType="com.bonus.material.comprehensive.entity.RentDetailDto">
 | 
			
		||||
        SELECT
 | 
			
		||||
            moi.`code` as orderCode,
 | 
			
		||||
            CONCAT( md.rent_begin_time, '至', md.rent_end_time ) as rentTime,
 | 
			
		||||
            CONCAT(DATE_FORMAT(md.rent_begin_time, '%Y-%m-%d'),' 至 ',DATE_FORMAT(md.rent_end_time, '%Y-%m-%d')) AS rentTime,
 | 
			
		||||
            md.order_status as orderStatus,
 | 
			
		||||
            md.costs as rentCost,
 | 
			
		||||
            COALESCE ( lrr.repair_change_price, lrr.repair_price, 0 ) AS repairCost,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue