Merge remote-tracking branch 'origin/test' into test

# Conflicts:
#	hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountRequestFundsServiceImpl.java

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountRequestFundsServiceImpl.java

@@ -44,6 +44,7 @@ import java.util.stream.Collectors;
  */
 @Service
 public class AccountRequestFundsServiceImpl extends ServiceImpl<AccountRequestFundsMapper, AccountRequestFunds> implements AccountRequestFundsService {
+
     @Autowired
     private CorporationService corporationService;
 
@@ -58,19 +59,15 @@ public class AccountRequestFundsServiceImpl extends ServiceImpl<AccountRequestFu
 
     /**
      * 查询请款列表
-     *
      * @param dto
      * @return
      */
     @Override
     public Page<AccountRequestFundsVo> getPage(AccountRequestFundsSelectDto dto) {
         QueryWrapper<Object> wrapper = Wrappers.query();
-
-        wrapper.orderByDesc("ap.status", "arf.payment_time", "arf.create_time");
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getType()), "arf.type", dto.getType());
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getStatus()), "arf.status", dto.getStatus());
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getPaymentStatus()), "ap.status", dto.getPaymentStatus());
-        wrapper.eq(ObjectUtil.isNotEmpty(dto.getWriteOffStatus()), "arf.write_off_status", dto.getWriteOffStatus());
         wrapper.like(ObjectUtil.isNotEmpty(dto.getKeyword()), "arf.payment_remarks", dto.getKeyword());
         wrapper.orderByDesc("ap.status", "arf.payment_time", "arf.create_time");
         Page<AccountRequestFundsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
@@ -115,8 +112,6 @@ public class AccountRequestFundsServiceImpl extends ServiceImpl<AccountRequestFu
 
     /**
      * 查询请款详情
-     * @param id
-     * @return
      */
     @Override
     public AccountRequestFundsVo detail(Long id) {