Merge branch 'master-vehicle-price' into dev-tiande

xx-order/xx-order-server/src/main/resources/mapper/CompanyWaterDetailMapper.xml

@@ -58,7 +58,7 @@
             </if>
             <if test="branchId != null and branchId > 0">
                 and  branch_id=#{branchId}
-            </if>0
+            </if>
             <if test="dataCompanyIds != null and dataCompanyIds.size() > 0">
                 and company_id  in
                 <foreach collection="dataCompanyIds"  item="item" separator="," open="(" close=")">