-
Administrator authored
# Conflicts: # dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/OpRegionalEconomicDataDetailsDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/OpRegionalEconomicDataRegionalListDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/OpRegionalEconomicDataStatisticsRegionalDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/OpRegionalEconomicDataV1Dto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/OpRegionalEconomicDataV1PageDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/OpRegionalEconomicDataYearsListDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/OpRegionalEconomicRegionalCompareDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/SpecialBondInformationDetailsDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/SpecialBondInformationPageDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/SpecialBondProjectDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/SpecialPurposeBondsDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/SpecialPurposeBondsPageDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/UrbanInvestmentPlatformDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/UrbanInvestmentPlatformSubjectLevelDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/AchievementQueryDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/AptitudeDetailDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/AptitudeDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/AptitudeQueryDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/AwardDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/AwardQueryDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/BatchQueryDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/BeijingQueryDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/BusinessInfoDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/ComposePersonnelQueryDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/ComposeQueryDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/ComposeRegisterDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/CreditBehaviorDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/CreditEvaluateDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/DateQueryDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/Enterprise.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/EnterpriseDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/Entity.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/EstablishmentDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/GoodBehaviorDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/HeaderDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/JabBasicEnterpriseProjectDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/JiangxiBidQueryDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/JskBidCandidateDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/JskBidNewsDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/JskBidPlanDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/JskBidQueryDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/JskBidWinListDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/JskDataScreenDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/KeywordDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/LandMarketDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/OpRegionalLocalDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/Page.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/Personnel.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/PersonnelCertificateQueryDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/PersonnelExeclDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/PersonnelQueryDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/RecentlyBidQueryDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/ReflectionUtils.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/RegisterTypeDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/ShuiliAchievementQueryDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/SkyProjectIndexDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/YitihuaAchievementQueryDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/ZaiJianListDto.java # dsk-module/dsk-biz-api/src/main/java/com/dsk/search/domain/ZaiJianPersonnelDto.java
ff40ed9a
