解决冲突

src/main/java/com/steerinfo/dil/controller/RmsCapacityController.java

@@ -133,22 +133,18 @@ public class RmsCapacityController extends BaseRESTfulController {
                 mapValue.put("carrierSSOId", carrierSSOId);
             }
         }
-<<<<<<< HEAD
-        if (con != null && con.equals("")) {
-            con = null;
-        }
-        if (con != null && !con.equals("undefined")){
-            mapValue.put("con","%" + con +"%");
-        }
-        List<Map<String,Object>> listTotal = rmsCapacityService.getCapacityList(mapValue);
-=======
+//        if (con != null && con.equals("")) {
+//            con = null;
+//        }
+//        if (con != null && !con.equals("undefined")){
+//            mapValue.put("con","%" + con +"%");
+//        }
         if(con != null){
             if(!"".equals(con)){
                 mapValue.put("index", con);
             }
         }
         List<Map<String, Object>> listTotal = rmsCapacityService.getCapacityList(mapValue);
->>>>>>> 5b4d76552ee1dd5d49d5285fcaba63ce070322d7
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = rmsCapacityService.getCapacityList(mapValue);