From 22106718c5845ccd8fa2328d39b28f88e9761e91 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 21 五月 2024 14:49:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
index 4ad7d8b..62e2c9e 100644
--- a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
+++ b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
@@ -119,7 +119,7 @@
List<TCarBrand> brandList = tCarBrandService.selectList(new EntityWrapper<TCarBrand>().eq("state", 1));
model.addAttribute("brandList",brandList);
//车辆类型
- /*List<TCarModel> modelList = tCarModelService.selectList(new EntityWrapper<TCarModel>().eq("state", 1));
+ /*List<TCharteredService> modelList = tCarModelService.selectList(new EntityWrapper<TCharteredService>().eq("state", 1));
model.addAttribute("modelList",modelList);*/
List<TServerCarmodel> zcModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
--
Gitblit v1.7.1