Skip to content

D
dsk-cr20g
Switch branch/tag
  1. 07 Sep, 2023 5 commits
  3. 06 Sep, 2023 16 commits
  5. 05 Sep, 2023 19 commits
    • huangjie's avatar
      Merge branch 'zuhuduan' of http://192.168.60.201/root/dsk-operate-sys into zuhuduan · 6b24b82c
      huangjie authored
      6b24b82c
    • huangjie's avatar
      * · c95537b5
      huangjie authored
      c95537b5
    • 施翔轲's avatar
      修复用户批量操作bug · 1b4ab874
      施翔轲 authored
      1b4ab874
    • Administrator's avatar
      删除未用 · fa9a58fb
      Administrator authored 
      Signed-off-by: Administrator's avatarAdministrator <admin@example.com>
      fa9a58fb
    • tanyang's avatar
      更新提示 · e4e7f03b
      tanyang authored
      e4e7f03b
    • tanyang's avatar
      去除pageHelper · 1fc56537
      tanyang authored
      1fc56537
    • tanyang's avatar
      更新测试环境短信配置和登录有效期 · 28a14a28
      tanyang authored
      28a14a28
    • tanyang's avatar
      更新文件上传接口 · eb96e496
      tanyang authored
      eb96e496
    • 施翔轲's avatar
      修改Token有效期为5小时、更新用户批量导入模板 · 49a33724
      施翔轲 authored
      49a33724
    • huangjie's avatar
      Merge branch 'zuhuduan' of http://192.168.60.201/root/dsk-operate-sys into zuhuduan · f2895543
      huangjie authored
      f2895543
    • huangjie's avatar
      * · fd7ad8be
      huangjie authored
      fd7ad8be
    • 施翔轲's avatar
      修复禁用租户某项菜单后租户依旧能看到的问题 · 0fe06802
      施翔轲 authored
      0fe06802
    • Administrator's avatar
      Merge remote-tracking branch 'origin/zuhuduan' into zuhuduan · ff40ed9a
      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
    • Administrator's avatar
      剔除重复 · 83c46788
      Administrator authored 
      Signed-off-by: Administrator's avatarAdministrator <admin@example.com>
      83c46788
    • tanyang's avatar
      修复bean冲突 · fbe08a9c
      tanyang authored
      fbe08a9c
    • Administrator's avatar
      原 search迁移 · 709e329a
      Administrator authored 
      Signed-off-by: Administrator's avatarAdministrator <admin@example.com>
      709e329a
    • Administrator's avatar
      原 search迁移 · 82032e3e
      Administrator authored 
      Signed-off-by: Administrator's avatarAdministrator <admin@example.com>
      82032e3e
    • Administrator's avatar
      原 search迁移 · cc7c495f
      Administrator authored 
      Signed-off-by: Administrator's avatarAdministrator <admin@example.com>
      cc7c495f
    • Administrator's avatar
      原 search迁移 · 5f3061b8
      Administrator authored
      5f3061b8