Merge branch 'bug_20221130'

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/UserAccountRecordController.java

@@ -57,6 +57,9 @@ public class UserAccountRecordController extends BaseController {
     @ApiOperation(value = "查询分页", notes = "传入userAccountRecordSearch")
     @PreAuthorize("@pcs.hasPermissions('userAccountRecord/page')")
     public HttpResponseResult<PageInfo<UserAccountRecordVo>> page(@RequestBody UserAccountRecordSearch query) {
+        if (query.getInOrOut() == null) {
+            query.setInOrOut(InOrOutEnum.IN);
+        }
         IPage<UserAccountRecordVo> pages = userAccountRecordService.selectPage(PageUtil.getPage(query), query);
         return succeed(PageUtil.pageInfo(pages));
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/UserAccountRecordSearch.java

@@ -27,7 +27,7 @@ public class UserAccountRecordSearch extends QueryInfo{
 	private String orderNo;
 
 	@ApiModelProperty("收支类型：IN、收入 OUT、支出 ")
-	private InOrOutEnum inOrOut = InOrOutEnum.IN;
+	private InOrOutEnum inOrOut ;
 
 	@ApiModelProperty(value = "入账状态 WAIT 待入账 FROZEN 冻结入账 RECORDED 已入账 CANCEL 退费 ")
 	private PostStatusEnum postStatus;