修改

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/ActivityPopularizeController.java

@@ -206,13 +206,4 @@ public class ActivityPopularizeController extends BaseController<ActivityPopular
             return finishUserVO;
         }).collect(Collectors.toList()));
     }
-
-//    public static void main(String[] args) {
-//        Map<String, String> map = new HashMap<String, String>(){{
-////            put("1", null);
-////            put("2", null);
-//        }};
-//        List<String> list = map.entrySet().stream().map(k -> k.getKey()).collect(Collectors.toList());
-//        System.out.println(list);
-//    }
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/VehicleApplication.java

@@ -7,16 +7,15 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication(scanBasePackages = {
         "com.xxfc.platform",
-//        "com.xxfc.platform.vehicle",
-//        "com.xxfc.platform.vehicle.biz",
-//        "com.xxfc.platform.vehicle.rest",
         "com.github.wxiaoqi.security.common.handler",
         "com.github.wxiaoqi.security.common.log"
 })
+//@ComponentScan(basePackages={"com.xxfc.platform.vehicle.rest"})
 @EnableDiscoveryClient
 @EnableScheduling
 @EnableAceAuthClient

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

@@ -233,6 +233,7 @@
 <!--                    #{companyId},-->
 <!--                </foreach>-->
 <!--            </trim>-->
+            )
         </if>
         <if test="mRangeDateEnd !=null">
             and v.maintenance_date &lt;= #{mRangeDateEnd}