application冲突解决

src/main/resources/application.yml

@@ -20,7 +20,7 @@ spring:
       max-request-size: 1GB
   datasource:
     druid:
-      url: jdbc:mysql://192.168.0.109/db_cloud_population?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
+      url: jdbc:mysql://localhost:3306/db_user_management?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
       db-type: mysql
       driver-class-name: com.mysql.jdbc.Driver
       username: root

src/main/resources/mybatis/mapper/censusmsg/censusmsg-mapper.xml

@@ -259,6 +259,9 @@
         <if test="keywords != null and keywords != ''">
             AND (
             t1.name_of_householder LIKE CONCAT('%', #{keywords}, '%')
+            OR
+            t1.base_id LIKE CONCAT('%', #{keywords}, '%')
+            )
         </if>
         <if test="startTime != null and startTime != ''">
             AND

src/main/resources/mybatis/mapper/floatingpopulation/floatingpopulation-mapper.xml

@@ -268,6 +268,8 @@
         <if test="keywords != null and keywords != ''">
             AND (
                 t1.card_number LIKE CONCAT('%', #{keywords}, '%')
+                OR
+                t1.base_id LIKE CONCAT('%', #{keywords}, '%')
             )
         </if>
         <if test="startTime != null and startTime != ''">