Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailService.java

@@ -143,9 +143,9 @@ public class BusVehicleApplyDetailService extends MybatisBaseService<BusVehicleA
         QueryWrapper<BusVehicleApply> qw = new QueryWrapper<>();
 		if (query != null) {
 			//车型sid
-			qw.eq("bd.modelSid", query.getModelSid());
+			qw.eq("bd.vehicleSid", query.getModelSid());
 			//配置sid
-			qw.eq("bd.modelConfigSid", query.getConfigSid());
+			qw.eq("bd.configSid", query.getConfigSid());
 			if (query.getSidList().size() > 0) {
 				qw.notIn("bo.sid", query.getSidList());
 			}