fix:解决冲突

ruoyi-system/src/main/java/com/ruoyi/system/test/ljj.java

@@ -29,24 +29,24 @@ public class ljj {
 
     public static void main(String[] args) {
 
-            String condition = "ceshi_link1.del_flag = '0' AND ceshi_link1.province=1";
-
-        List<Map<String, Object>> mapList = new ArrayList<>();
-        Map<String, Object> objectMap = new HashMap<>();
-        objectMap.put("one.qwe", "1");
-//        objectMap.put("two", "2");
-//        objectMap.put("three", "3");
-//        objectMap.put("four", "4");
-        mapList.add(objectMap);
-        System.out.println(objectMap.get("one.qwe"));
-        System.out.println(mapList.get(0).keySet());
-
-
-            // 移除包含 "=1" 的条件
-            String result = removeConditionFromString(condition, "=1");
-
-            // 打印结果
-            System.out.println(result);
+//            String condition = "ceshi_link1.del_flag = '0' AND ceshi_link1.province=1";
+//
+//        List<Map<String, Object>> mapList = new ArrayList<>();
+//        Map<String, Object> objectMap = new HashMap<>();
+//        objectMap.put("one.qwe", "1");
+////        objectMap.put("two", "2");
+////        objectMap.put("three", "3");
+////        objectMap.put("four", "4");
+//        mapList.add(objectMap);
+//        System.out.println(objectMap.get("one.qwe"));
+//        System.out.println(mapList.get(0).keySet());
+//
+//
+//            // 移除包含 "=1" 的条件
+//            String result = removeConditionFromString(condition, "=1");
+//
+//            // 打印结果
+//            System.out.println(result);
 
 
 //        List<String> bigList = new ArrayList<>();