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/AccountRunningWaterServiceImpl.java

code/src/test/java/BaseDataSource.java

@@ -3,6 +3,7 @@ import fly.generator.GeneratorApplication;
 public class BaseDataSource {
 
     public static void main(String[] args) {
+        // test
         GeneratorApplication.builder()
                 .url("jdbc:mysql://36.134.91.96:17330/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
                 .username("fjhx2012mysql")

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

@@ -59,6 +59,7 @@ public class AccountRequestFundsServiceImpl extends ServiceImpl<AccountRequestFu
 
     /**
      * 查询请款列表
+     *
      * @param dto
      * @return
      */

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

@@ -21,8 +21,8 @@ import com.fjhx.item.util.excel.util.ExcelUtil;
 import com.fjhx.tenant.entity.dict.dto.DictTenantDataSelectDto;
 import com.fjhx.tenant.entity.dict.vo.DictTenantDataVo;
 import com.fjhx.tenant.service.dict.DictTenantDataService;
+import com.obs.services.internal.ServiceException;
 import com.ruoyi.common.core.domain.BaseSelectDto;
-import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -51,6 +51,7 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
     private DictTenantDataService dictTenantDataService;
 
 
+
     @Override
     public Page<AccountRunningWaterVo> getPage(AccountRunningWaterSelectDto dto) {
         QueryWrapper<Object> wrapper = Wrappers.query();