Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/rest/AppVersionController.java

@@ -59,8 +59,8 @@ public class AppVersionController extends BaseController<AppVersionBiz,AppVersio
 
 
     @ApiOperation("查询")
-    @RequestMapping(value = "/{id}",method = RequestMethod.GET)
-    public ObjectRestResponse<AppVersion> get(@PathVariable Integer id){
+    @RequestMapping(value = "/getAppVersion/{id}",method = RequestMethod.GET)
+    public ObjectRestResponse<AppVersion> getAppVersion(@PathVariable Integer id){
         return ObjectRestResponse.succ(baseBiz.get(id));
     }
 

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourUserController.java

@@ -150,27 +150,7 @@ public class TourUserController extends TourBaseController<TourUserBiz> {
 
 
 
-    /**
-     * 删除
-     * @param
-     * @return
-     */
 
-    @ApiOperation("删除")
-    @PostMapping(value = "/app/del/{id}")
-    @Transactional(rollbackFor = Exception.class)
-    public ObjectRestResponse<TourUser> del(@PathVariable Integer id){
-        try {
-            TourUser tourUser= new TourUser();
-            tourUser.setIsdel(1);
-            baseBiz.updateSelectiveById(tourUser);
-            return ObjectRestResponse.succ();
-        } catch (Exception e) {
-            e.printStackTrace();
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-           return ObjectRestResponse.createDefaultFail();
-        }
-    }
 
 
 }
\ No newline at end of file

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

@@ -282,7 +282,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
     }
 
 
-    @ApiOperation("查询所有")
+    @ApiOperation("优质车型")
     @GetMapping(value = "/goodList")
     public List<GoodDataVO> goodList(@RequestParam("page") Integer page,@RequestParam("limit") Integer limit){
         return baseBiz.goodList(page,limit);