Merge remote-tracking branch 'origin/master'

# Conflicts:
#	fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/UserConsumptionDetailsController.java
#	fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/UserRechargeCardsController.java
#	fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/UserRechargeController.java

fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/UserConsumptionDetailsController.java

@@ -3,6 +3,7 @@ package com.fastbee.data.controller.userRecharge;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.fastbee.rechargecard.domain.dto.UserConsumptionDetailsDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -41,7 +42,6 @@ public class UserConsumptionDetailsController extends BaseController
     /**
      * 查询用户充值卡账单明细记录列表
      */
-//    @PreAuthorize("@ss.hasPermi('rechargecard:details:list')")
     @GetMapping("/list")
     @ApiOperation("查询用户充值卡账单明细记录列表")
     public TableDataInfo list(UserConsumptionDetails userConsumptionDetails)
@@ -54,13 +54,12 @@ public class UserConsumptionDetailsController extends BaseController
     /**
      * 查询用户充值卡账单明细记录列表
      */
-//    @PreAuthorize("@ss.hasPermi('rechargecard:details:list')")
     @GetMapping("/list/show")
     @ApiOperation("查询用户充值卡账单明细记录展示列表")
     public TableDataInfo Showlist(UserConsumptionDetails userConsumptionDetails)
     {
         startPage();
-        List<UserConsumptionDetails> list = userConsumptionDetailsService.selectUserConsumptionDetailsShowList(userConsumptionDetails);
+        List<UserConsumptionDetailsDto> list = userConsumptionDetailsService.selectUserConsumptionDetailsShowList(userConsumptionDetails);
         return getDataTable(list);
     }
 
@@ -68,7 +67,6 @@ public class UserConsumptionDetailsController extends BaseController
      * 导出用户充值卡账单明细记录列表
      */
     @ApiOperation("导出用户充值卡账单明细记录列表")
-//    @PreAuthorize("@ss.hasPermi('rechargecard:details:export')")
     @PostMapping("/export")
     public void export(HttpServletResponse response, UserConsumptionDetails userConsumptionDetails)
     {
@@ -80,7 +78,6 @@ public class UserConsumptionDetailsController extends BaseController
     /**
      * 获取用户充值卡账单明细记录详细信息列表
      */
-//    @PreAuthorize("@ss.hasPermi('rechargecard:details:query')")
     @GetMapping(value = "/list/{cardNumber}")
     @ApiOperation("获取用户充值卡账单明细记录详细信息列表")
     public AjaxResult getInfo(@PathVariable("cardNumber") String cardNumber)
@@ -92,7 +89,6 @@ public class UserConsumptionDetailsController extends BaseController
     /**
      * 获取用户充值卡账单明细记录详细信息
      */
-//    @PreAuthorize("@ss.hasPermi('rechargecard:details:query')")
     @GetMapping(value = "/{id}")
     @ApiOperation("获取用户充值卡账单明细记录详细信息")
     public AjaxResult getInfo(@PathVariable("id") Long id)
@@ -104,7 +100,6 @@ public class UserConsumptionDetailsController extends BaseController
     /**
      * 新增用户充值卡账单明细记录
      */
-//    @PreAuthorize("@ss.hasPermi('rechargecard:details:add')")
     @PostMapping
     @ApiOperation("新增用户充值卡账单明细记录")
     public AjaxResult add(@RequestBody UserConsumptionDetails userConsumptionDetails)
@@ -115,7 +110,6 @@ public class UserConsumptionDetailsController extends BaseController
     /**
      * 修改用户充值卡账单明细记录
      */
-//    @PreAuthorize("@ss.hasPermi('rechargecard:details:edit')")
     @PutMapping
     @ApiOperation("修改用户充值卡账单明细记录")
     public AjaxResult edit(@RequestBody UserConsumptionDetails userConsumptionDetails)
@@ -126,7 +120,6 @@ public class UserConsumptionDetailsController extends BaseController
     /**
      * 删除用户充值卡账单明细记录
      */
-//    @PreAuthorize("@ss.hasPermi('rechargecard:details:remove')")
     @DeleteMapping("/{ids}")
     @ApiOperation("删除用户充值卡账单明细记录")
     public AjaxResult remove(@PathVariable Long[] ids)

fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/UserRechargeCardsController.java

@@ -41,7 +41,7 @@ public class UserRechargeCardsController extends BaseController
     /**
      * 测试
      */
-//    @PreAuthorize("@ss.hasPermi('rechargecard:cards:query')")
+
     @GetMapping(value = "/test/{id}")
     @ApiOperation("获取用户充值卡详细信息")
     public AjaxResult test(@PathVariable("id") Long id)
@@ -53,7 +53,7 @@ public class UserRechargeCardsController extends BaseController
     /**
      * 查询用户充值卡列表
      */
-//    @PreAuthorize("@ss.hasPermi('rechargecard:cards:list')")
+
     @GetMapping("/list")
     @ApiOperation("查询用户充值卡列表")
     public TableDataInfo list(UserRechargeCards userRechargeCards)
@@ -67,7 +67,7 @@ public class UserRechargeCardsController extends BaseController
      * 导出用户充值卡列表
      */
     @ApiOperation("导出用户充值卡列表")
-//    @PreAuthorize("@ss.hasPermi('rechargecard:cards:export')")
+
     @PostMapping("/export")
     public void export(HttpServletResponse response, UserRechargeCards userRechargeCards)
     {
@@ -79,7 +79,7 @@ public class UserRechargeCardsController extends BaseController
     /**
      * 获取用户充值卡详细信息
      */
-//    @PreAuthorize("@ss.hasPermi('rechargecard:cards:query')")
+
     @GetMapping(value = "/{id}")
     @ApiOperation("获取用户充值卡详细信息")
     public AjaxResult getInfo(@PathVariable("id") Long id)
@@ -91,7 +91,7 @@ public class UserRechargeCardsController extends BaseController
     /**
      * 新增用户充值卡
      */
-//    @PreAuthorize("@ss.hasPermi('rechargecard:cards:add')")
+
     @PostMapping
     @ApiOperation("新增用户充值卡")
     public AjaxResult add(@RequestBody UserRechargeCards userRechargeCards)
@@ -102,7 +102,7 @@ public class UserRechargeCardsController extends BaseController
     /**
      * 修改用户充值卡
      */
-//    @PreAuthorize("@ss.hasPermi('rechargecard:cards:edit')")
+
     @PutMapping
     @ApiOperation("修改用户充值卡")
     public AjaxResult edit(@RequestBody UserRechargeCards userRechargeCards)
@@ -113,7 +113,7 @@ public class UserRechargeCardsController extends BaseController
     /**
      * 删除用户充值卡
      */
-//    @PreAuthorize("@ss.hasPermi('rechargecard:cards:remove')")
+
     @DeleteMapping("/{id}")
     @ApiOperation("删除用户充值卡")
     public AjaxResult remove(@PathVariable Long id)

fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/UserRechargeController.java

@@ -27,10 +27,11 @@ public class UserRechargeController extends BaseController {
     @Autowired
     private IUserRechargeCardsService userRechargeCardsService;
 
+
+
     /**
      * 修改用户充值卡金额
      */
-//    @PreAuthorize("@ss.hasPermi('rechargecard:cards:edit')")
     @PutMapping
     @ApiOperation("修改用户充值卡")
     public AjaxResult result(@RequestBody RechargecardUser rechargecardUser)