Commits · 68c1d1663234768181c7b64b26ca2ee3955941d6 · 彭熊 / fund_report

09 Dec, 2020 40 commits
- 修改objective · 68c1d166
  李宗熹 authored Dec 09, 2020
  
  68c1d166
- 修改self · 9447fd90
  李宗熹 authored Dec 09, 2020
  
  9447fd90
- 修改默认值 · ff04c622
  李宗熹 authored Dec 09, 2020
  
  ff04c622
- 修改默认 · bc4c6da5
  李宗熹 authored Dec 09, 2020
  
  bc4c6da5
- 修改默认 · deaaac46
  李宗熹 authored Dec 09, 2020
  
  deaaac46
- 修改objective · 6cc02c7e
  李宗熹 authored Dec 09, 2020
  
  6cc02c7e
- Merge remote-tracking branch 'origin/dev' into dev · f0f0f190
  李宗熹 authored Dec 09, 2020
  
  f0f0f190
- Delete tamp_order.log · fbac2590
  李宗熹 authored Dec 09, 2020
  
  fbac2590
- Delete tamp_course_order.log · 70e50018
  李宗熹 authored Dec 09, 2020
  
  70e50018
- Delete 王斐_刘国铭_.pdf · 64f6011f
  李宗熹 authored Dec 09, 2020
  
  64f6011f
- 客观参数 · 416fd0a4
  李宗熹 authored Dec 09, 2020
  
  416fd0a4
- 样式 · 94183a00
  pengxiong authored Dec 09, 2020
  
  94183a00
- 万元去掉 · 06079d37
  pengxiong authored Dec 09, 2020
  
  06079d37
- Merge branch 'dev' of http://47.100.44.39:10001/pengxiong/fund_report into dev · f3dabf25
  pengxiong authored Dec 09, 2020
  
  f3dabf25
- 旧指标对比剥离 · a95fe87e
  赵杰 authored Dec 09, 2020
  
  a95fe87e
- Merge remote-tracking branch 'origin/dev' into dev · d3133d4a
  pengxiong authored Dec 09, 2020
  
  d3133d4a
- 分离 · 0cc22f1d
  pengxiong authored Dec 09, 2020
  
  0cc22f1d
- 收益对比百分比 · 077b37a0
  赵杰 authored Dec 09, 2020
  
  077b37a0
- Merge branch 'dev' of http://47.100.44.39:10001/pengxiong/fund_report into dev · 2e845ab1
  pengxiong authored Dec 09, 2020
```
# Conflicts:
#	app/service/data_service.py
```
  2e845ab1
- 样式2 · d7064c59
  pengxiong authored Dec 09, 2020
  
  d7064c59
- 旧组合收益比较剥离 · b7a8eb3a
  赵杰 authored Dec 09, 2020
  
  b7a8eb3a
- Merge branch 'dev' of http://47.100.44.39:10001/pengxiong/fund_report into dev · fd490bcd
  pengxiong authored Dec 09, 2020
  
  fd490bcd
- 修改异常 · 15325da2
  李宗熹 authored Dec 09, 2020
  
  15325da2
- Merge branch 'dev' of http://47.100.44.39:10001/pengxiong/fund_report into dev · ac64e3d0
  pengxiong authored Dec 09, 2020
  
  ac64e3d0
- 修改异常 · 06ecd2b6
  李宗熹 authored Dec 09, 2020
  
  06ecd2b6
- 点评中截止日期 · 2d9f3ed0
  赵杰 authored Dec 09, 2020
  
  2d9f3ed0
- 模板单位 · edd8f84d
  赵杰 authored Dec 09, 2020
  
  edd8f84d
- Merge branch 'dev' of http://47.100.44.39:10001/pengxiong/fund_report into dev · be101748
  pengxiong authored Dec 09, 2020
  
  be101748
- Merge remote-tracking branch 'origin/dev' into dev · f1a9a1e9
  赵杰 authored Dec 09, 2020
  
  f1a9a1e9
- Decimal数据 · d928ec39
  赵杰 authored Dec 09, 2020
  
  d928ec39
- Merge branch 'dev' of http://47.100.44.39:10001/pengxiong/fund_report into dev · 251d5948
  pengxiong authored Dec 09, 2020
  
  251d5948
- Merge remote-tracking branch 'origin/dev' into dev · fe4a5eb0
  李宗熹 authored Dec 09, 2020
  
  fe4a5eb0
- 修改基金诊断 · df0d3448
  李宗熹 authored Dec 09, 2020
  
  df0d3448
- Merge remote-tracking branch 'origin/dev' into dev · d18d8290
  pengxiong authored Dec 09, 2020
  
  d18d8290
- Merge remote-tracking branch 'origin/dev' into dev · a8ec611a
  赵杰 authored Dec 09, 2020
  
  a8ec611a
- 数据decimal · db686a64
  赵杰 authored Dec 09, 2020
  
  db686a64
- Merge remote-tracking branch 'origin/dev' into dev · b4c95f2e
  李宗熹 authored Dec 09, 2020
```
# Conflicts:
#	app/service/portfolio_diagnose.py
```
  b4c95f2e
- 修改基金诊断 · e6e5d8e8
  李宗熹 authored Dec 09, 2020
  
  e6e5d8e8
- Merge branch 'dev' of http://47.100.44.39:10001/pengxiong/fund_report into dev · add80656
  pengxiong authored Dec 09, 2020
```
# Conflicts:
#	app/service/data_service.py
#	app/utils/jinjia2html.py
```
  add80656
- 样式 · 3a23edc9
  pengxiong authored Dec 09, 2020
  
  3a23edc9