Merge remote-tracking branch 'origin/base-modify' into base-modify

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

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourBannerBiz.java

@@ -25,7 +25,7 @@ public class TourBannerBiz extends BaseBiz<TourBannerMapper,TourBanner> {
     @Autowired
     private RedisTemplate redisTemplate;
 
-    @Cache(key = RedisKey.CONSTANT_CODE_PREFIX_BANNER)
+//    @Cache(key = RedisKey.CONSTANT_CODE_PREFIX_BANNER)
     public List<TourBanner> findBannerList() {
 
         TourBanner banner = new TourBanner();

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourTagBiz.java

@@ -37,6 +37,7 @@ public class TourTagBiz extends BaseBiz<TourTagMapper,TourTag> {
     @Autowired
     private TourTagBiz tagBiz;
 
+//    @Cache(key = RedisKey.CONSTANT_CODE_PREFIX_HOTTAG)
     public List<TourTag> getHotTag() {
 
         TourTag tag = new TourTag();

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

 package com.xxfc.platform.tour.rest;
 
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
-import com.github.wxiaoqi.security.common.msg.ListRestResponse;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
-import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
-import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.tour.biz.TourUserBiz;
 import com.xxfc.platform.tour.common.TourBaseController;
-import com.xxfc.platform.tour.entity.TourGood;
 import com.xxfc.platform.tour.entity.TourUser;
+import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import tk.mybatis.mapper.entity.Example;
+import org.springframework.web.bind.annotation.*;
 import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import java.util.Arrays;
@@ -32,7 +25,7 @@ public class TourUserController extends TourBaseController<TourUserBiz> {
     public ObjectRestResponse getTourUser(@PathVariable int isChild){
         AppUserDTO userInfo = getUserInfo();
         Integer id = userInfo.getId();
-       List<TourUser> tourUsers= baseBiz.getTourUser(id,isChild);
+        List<TourUser> tourUsers= baseBiz.getTourUser(id,isChild);
 
        return ObjectRestResponse.succ(tourUsers);
     }
@@ -46,4 +39,20 @@ public class TourUserController extends TourBaseController<TourUserBiz> {
         return ObjectRestResponse.succ(tourUsers);
     }
 
+
+    @ApiOperation("修改")
+    @PostMapping(value = "/update")
+    public ObjectRestResponse<TourUser> update(@RequestBody TourUser tourUser){
+        baseBiz.updateSelectiveById(tourUser);
+        return new ObjectRestResponse<TourUser>();
+    }
+
+    @ApiOperation("添加")
+    @PostMapping(value = "/add")
+    public ObjectRestResponse<TourUser> add(@RequestBody TourUser tourUser){
+        baseBiz.insertSelective(tourUser);
+        return new ObjectRestResponse<TourUser>();
+    }
+
+
 }
\ No newline at end of file