| 
					
				 | 
			
			
				@@ -235,8 +235,8 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <if test="waterBillNo != null ">and ware.water_bill_no = #{waterBillNo}</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <if test="fSystemType != null and fSystemType != ''">and ware.f_system_type = #{fSystemType}</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         </where> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        ORDER BY ware.f_id desc 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         ${params.dataScope} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        ORDER BY ware.f_id desc 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <select id="selectTFeeList1" parameterType="TFee" resultType="Map"> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -324,8 +324,8 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <if test="fSystemType != null and fSystemType != ''">and f.f_system_type = #{fSystemType}</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <if test="createBy != null and createBy != ''">and f.create_by = #{createBy}</if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         </where> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        ORDER BY f.f_id desc 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         ${params.dataScope} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        ORDER BY f.f_id desc 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <!--凯和查询财务信息--> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <select id="selectFinancialTFeeList" parameterType="TFee" resultType="com.ruoyi.finance.shipping.FinancialTFee"> 
			 |