From f9b9131367d9ba6fe852130b12083c0f5ea68bbb Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期一, 27 五月 2024 17:26:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TServerCarmodelController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TServerCarmodelController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TServerCarmodelController.java
index 4844438..c8f2b88 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TServerCarmodelController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TServerCarmodelController.java
@@ -170,7 +170,7 @@
*/
@RequestMapping(value = "/add")
@ResponseBody
- public Object add(TServerCarmodel tServerCarmodel) {
+ public Object add(TServerCarmodel tServerCarmodel,@RequestParam Integer isPrivateCar,@RequestParam Integer isPackage ) {
int count = tServerCarmodelService.selectCount(new EntityWrapper<TServerCarmodel>().eq("type", 1)
.eq("name", tServerCarmodel.getName()).last(" and not FIND_IN_SET(state,'3')"));
if (count > 0){
@@ -179,6 +179,8 @@
tServerCarmodel.setInsertTime(new Date());
tServerCarmodel.setState(1);
tServerCarmodel.setType(1);
+ tServerCarmodel.setIsPackage(isPackage);
+ tServerCarmodel.setIsPrivateCar(isPrivateCar);
tServerCarmodelService.insert(tServerCarmodel);
return SUCCESS_TIP;
}
@@ -188,10 +190,12 @@
*/
@RequestMapping(value = "/update")
@ResponseBody
- public Object update(TServerCarmodel tServerCarmodel) {
+ public Object update(TServerCarmodel tServerCarmodel,@RequestParam Integer isPrivateCar,@RequestParam Integer isPackage) {
tServerCarmodel.setInsertTime(new Date());
tServerCarmodel.setState(1);
tServerCarmodel.setType(1);
+ tServerCarmodel.setIsPackage(isPackage);
+ tServerCarmodel.setIsPrivateCar(isPrivateCar);
tServerCarmodelService.updateById(tServerCarmodel);
return SUCCESS_TIP;
}
--
Gitblit v1.7.1