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

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/MyWalletCathBiz.java

@@ -40,7 +40,9 @@ public class MyWalletCathBiz extends BaseBiz<MyWalletCathMapper, MyWalletCath> {
 
         Example example = new Example(MyWalletCath.class);
         Example.Criteria criteria = example.createCriteria();
+        if (Objects.nonNull(state)) {
             criteria.andEqualTo("stauts", state);
+        }
         criteria.andEqualTo("userId", userId);
         example.setOrderByClause("crt_time DESC");
         PageDataVO<MyWalletCath> walletCathPage = PageDataVO.pageInfo(pageNo, pageSize, () -> mapper.selectByExample(example));

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/WalletCathController.java

@@ -35,7 +35,7 @@ public class WalletCathController {
 
     @ApiOperation("提现记录列表")
     @GetMapping("/page")
-    public ObjectRestResponse<WalletCathPageVo> findWatchCatchByWithdrawalState(@RequestParam("state") Integer state,
+    public ObjectRestResponse<WalletCathPageVo> findWatchCatchByWithdrawalState(@RequestParam(value = "state",required = false) Integer state,
                                                                                 @RequestParam("pageNo") Integer pageNo,
                                                                                 @RequestParam("pageSize") Integer pageSize,
                                                                                 HttpServletRequest request) {