Merge remote-tracking branch 'origin/master'

yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerVehicleVo.java

@@ -52,6 +52,7 @@ import lombok.Data;
 public class AsCustomerVehicleVo implements Vo {
 
     private String customerVehSid; // 客户车辆信息sid
+    private String isEnable; // 客户车辆信息sid
 	@ApiModelProperty("车牌号")
     private String vehMark; // 车牌号
 	@ApiModelProperty("车架号")

yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml

@@ -16,6 +16,7 @@
 			sid customerVehSid,
 			vehMark,
 			vinNo,
+			isEnable,
 			lastMileage,
 			DATE_FORMAT( buyDate, '%Y-%m-%d' ) buyDate,
 			DATE_FORMAT( nextMaintainDate, '%Y-%m-%d' ) nextMaintainDate

yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java

@@ -236,6 +236,7 @@ public class AsCustomerVehicleService extends MybatisBaseService<AsCustomerVehic
         if (StringUtils.isNotBlank(query.getVehMark())) {
             qw.like("v.vehMark", query.getVehMark());
         }
+        qw.eq("v.isEnable",1);
         qw.orderByDesc("c.sid");
         IPage<AsCustomerVehicle> page = PagerUtil.queryToPage(pq);
         IPage<AsCustomerCrmVehVo> pagging = baseMapper.customerList(page, qw);