Commits · 5963f36054f79a3ee3cf63a30e302a853660f298 · data-spider / asset-distribution

02 Apr, 2020 3 commits
- f · 5963f360
  liwenbin authored Apr 02, 2020
  
  5963f360
- Merge branch 'zj-niwodai' of http://git.quantgroup.cn/data-spider/asset-server into zj-niwodai · a4da5274
  liwenbin authored Apr 02, 2020
  
  a4da5274
- ix · 8400bdac
  liwenbin authored Apr 02, 2020
  
  8400bdac
01 Apr, 2020 7 commits
- 增加删除临时文件 · 352eb876
  郑建 authored Apr 01, 2020
  
  352eb876
- 增加删除临时文件 · 87f50b15
  郑建 authored Apr 01, 2020
  
  87f50b15
- 修改key文件读取方式 · b406378d
  郑建 authored Apr 01, 2020
  
  b406378d
- 修改key文件读取方式 · 351a08d9
  郑建 authored Apr 01, 2020
  
  351a08d9
- Merge remote-tracking branch 'origin/zj-niwodai' into zj-niwodai · a16693a8
  郑建 authored Apr 01, 2020
```
# Conflicts:
#	src/main/java/com/quantgroup/asset/distribution/controller/FundModuleController.java
#	src/test/java/com/quantgroup/asset/distribution/niwodai/NiwodaiTest.java
```
  a16693a8
- fix conflict · 210a7969
  liwenbin authored Apr 01, 2020
  
  210a7969
- 你我贷助贷资金需求 · 02f55d66
  liwenbin authored Apr 01, 2020
  
  02f55d66
31 Mar, 2020 4 commits
- 量子魔方回退 · d35b9214
  zhengjian authored Mar 31, 2020
  
  d35b9214
- Revert "量子魔方6.6第二期" · d1ad451e
  zhengjian authored Mar 31, 2020
```
This reverts commit bd72559e
```
  d1ad451e
- 你我贷回退量子模仿修改 · 490ace9c
  zhengjian authored Mar 31, 2020
  
  490ace9c
- 你我贷恢复配置 · c07d4931
  zhengjian authored Mar 31, 2020
  
  c07d4931
30 Mar, 2020 3 commits
- 量子魔方6.6第二期 · 3869dd56
  郑建 authored Mar 30, 2020
  
  3869dd56
- 量子魔方 · 1b746e2d
  郑建 authored Mar 30, 2020
  
  1b746e2d
- 量子魔方6.6第二期 · bd72559e
  郑建 authored Mar 30, 2020
  
  bd72559e
26 Mar, 2020 1 commit

你我贷 · b67fddea

郑建 authored Mar 25, 2020

1.降低protobuf版本到2.5.0以兼容Hbase 3.6.1版本中缺少必要文件并不能向下兼容
2.删除无用的静态文件只保留12标准的jks文件即可
3.将对方给的公司名写到随机数组中后续晓飞建议加到配置中

b67fddea

25 Mar, 2020 1 commit
- Merge branch 'zj-niwodai' of http://git.quantgroup.cn/data-spider/asset-server into zj-niwodai · d8107c9e
  liwenbin authored Mar 25, 2020
  
  d8107c9e
24 Mar, 2020 5 commits
- fix · ecf06b47
  liwenbin authored Mar 24, 2020
  
  ecf06b47
- 添加助贷资金路由耗时 · 98f87ebc
  data-爬虫-任锋 authored Mar 24, 2020
  
  98f87ebc
- 添加客户类别区分 · 042e2da3
  data-爬虫-任锋 authored Mar 24, 2020
  
  042e2da3
- 助贷资金路由模块 · 0a234638
  data-爬虫-任锋 authored Mar 24, 2020
  
  0a234638
- 你我贷 · 0b913ddc
  郑建 authored Mar 24, 2020
  
  0b913ddc
23 Mar, 2020 6 commits
- Merge remote-tracking branch 'origin/zj-niwodai' into zj-niwodai · 2137f928
  zhengjian authored Mar 23, 2020
  
  2137f928
- 你我贷 · aaa3d448
  zhengjian authored Mar 23, 2020
  
  aaa3d448
- 资产分发添加助贷资金导流 · 88cc84b5
  data-爬虫-任锋 authored Mar 23, 2020
  
  88cc84b5
- Merge remote-tracking branch 'origin/master' into zj-niwodai · 05628c06
  data-爬虫-任锋 authored Mar 23, 2020
  
  05628c06
- 你我贷 · 99598b8a
  zhengjian authored Mar 23, 2020
  
  99598b8a
- 你我贷 · e5131dee
  zhengjian authored Mar 23, 2020
  
  e5131dee
20 Mar, 2020 4 commits
- 审核结果添加sceneId · 78785c39
  data-爬虫-任锋 authored Mar 20, 2020
  
  78785c39
- 审核结果添加sceneId · f1d8ec3b
  data-爬虫-任锋 authored Mar 20, 2020
  
  f1d8ec3b
- 审核结果添加sceneId · c29454ce
  data-爬虫-任锋 authored Mar 20, 2020
  
  c29454ce
- 审核结果添加sceneId · 418a47e6
  data-爬虫-任锋 authored Mar 20, 2020
  
  418a47e6
19 Mar, 2020 1 commit
- 你我贷 · 40b95c9f
  zhengjian authored Mar 19, 2020
  
  40b95c9f
18 Mar, 2020 3 commits
- 审核结果添加sceneId · a252cd39
  data-爬虫-任锋 authored Mar 18, 2020
  
  a252cd39
- 审核结果添加sceneId · 8d292ac8
  data-爬虫-任锋 authored Mar 18, 2020
  
  8d292ac8
- 云信审核结果兼容 · 17cbcd00
  data-爬虫-任锋 authored Mar 18, 2020
  
  17cbcd00
17 Mar, 2020 1 commit
- 未找到资方渠道配置，直接做通知 · fbfa83f5
  liwenbin authored Mar 17, 2020
  
  fbfa83f5
06 Mar, 2020 1 commit
- fix · 86ca22f3
  liwenbin authored Mar 06, 2020
  
  86ca22f3