修改冲突

src/main/resources/com/steerinfo/dil/mapper/RmsCapacityMapper.xml

@@ -730,9 +730,9 @@
       </if>
     ORDER BY RC.INSERT_TIME DESC
     )
-    <if test="con != null">
-      where "capacityNumber" like #{con} or "carrierName" like #{con}
-    </if>
+<!--    <if test="con != null">-->
+<!--      where "capacityNumber" like #{con} or "carrierName" like #{con}-->
+<!--    </if>-->
     <where>
       <if test="capacityId!= null">
         and