Merge branch 'master' into webapi

Bailun.DC.Services/WebApiService/FinanceService.cs

@@ -792,6 +792,10 @@ or (is_lend=2 and cost_form=1)) and pay_time>= @start and pay_time< @end ");
                 {
                     sql.Append(" and company_name like '广州百伦供应链科技有限公司%' ");
                 }
+                else if (feeName.Contains("香港百伦科技有限公司"))
+                {
+                    sql.Append(" and type_name <> '物流费' ");
+                }
                 else
                 {
                     sql.Append(" and company_name = @feeName ");