Commits · 1cf3fd203665e8de0a893e5d168dbdb16f8b9313 · 彭熊 / fund_report

02 Dec, 2020 20 commits
- Merge branch 'dev' of http://47.100.44.39:10001/pengxiong/fund_report into dev · 1cf3fd20
  李宗熹 authored Dec 02, 2020
  
  1cf3fd20
- py · 39279e4f
  李宗熹 authored Dec 02, 2020
  
  39279e4f
- '暂存' · c676f4ca
  李宗熹 authored Dec 02, 2020
  
  c676f4ca
- 评价修改 · e85fed5b
  李宗熹 authored Dec 02, 2020
  
  e85fed5b
- 修改数据库为with形式调用 · 75230ea3
  赵杰 authored Dec 02, 2020
  
  75230ea3
- sql · 00eac2b5
  pengxiong@wealthgrow.cn authored Dec 02, 2020
  
  00eac2b5
- Merge branch 'dev' of http://47.100.44.39:10001/pengxiong/fund_report into dev · 214c73bb
  pengxiong@wealthgrow.cn authored Dec 02, 2020
  
  214c73bb
- 模版2 · 6af8acdf
  pengxiong@wealthgrow.cn authored Dec 02, 2020
  
  6af8acdf
- 修改变现文字颜色 · ffdf9625
  赵杰 authored Dec 02, 2020
  
  ffdf9625
- Merge branch 'dev' of http://47.100.44.39:10001/pengxiong/fund_report into dev · ee38ad4d
  pengxiong@wealthgrow.cn authored Dec 02, 2020
  
  ee38ad4d
- 模版 · feef4557
  pengxiong@wealthgrow.cn authored Dec 02, 2020
  
  feef4557
- 修改dataservice数据获取截止日期 · eb5e56e4
  赵杰 authored Dec 02, 2020
  
  eb5e56e4
- Merge remote-tracking branch 'origin/dev' into dev · 612a1e7d
  赵杰 authored Dec 02, 2020
```
# Conflicts:
#	app/service/portfolio_diagnose.py
```
  612a1e7d
- 原组合持仓点评 · 462fab91
  赵杰 authored Dec 02, 2020
  
  462fab91
- Merge branch 'dev' of http://47.100.44.39:10001/pengxiong/fund_report into dev · 1efe45c1
  pengxiong@wealthgrow.cn authored Dec 02, 2020
```
# Conflicts:
#	app/service/portfolio_diagnose.py
```
  1efe45c1
- 456 · 820e7028
  pengxiong@wealthgrow.cn authored Dec 02, 2020
  
  820e7028
- 添加个基评价 · a12f0fb3
  李宗熹 authored Dec 02, 2020
  
  a12f0fb3
- Merge branch 'dev' of http://47.100.44.39:10001/pengxiong/fund_report into dev · 92f5f387
  pengxiong@wealthgrow.cn authored Dec 02, 2020
  
  92f5f387
- 123 · e799e713
  pengxiong@wealthgrow.cn authored Dec 02, 2020
  
  e799e713
- 修复pandas升级后的代码问题 · 33df3fe6
  赵杰 authored Dec 02, 2020
  
  33df3fe6
01 Dec, 2020 11 commits
- Merge remote-tracking branch 'origin/dev' into dev · 105ee636
  pengxiong@wealthgrow.cn authored Dec 01, 2020
```
# Conflicts:
#	app/service/portfolio_diagnose.py
```
  105ee636
- 月度回报更新3 · db2faa80
  pengxiong@wealthgrow.cn authored Dec 01, 2020
  
  db2faa80
- 添加雷达图数据 · c70a4add
  李宗熹 authored Dec 01, 2020
  
  c70a4add
- Merge remote-tracking branch 'origin/dev' into dev · 307edefa
  赵杰 authored Dec 01, 2020
  
  307edefa
- 组合分解收益图数据 · c025702d
  赵杰 authored Dec 01, 2020
  
  c025702d
- 添加基金诊断模块 · f549e333
  李宗熹 authored Dec 01, 2020
  
  f549e333
- 月度回报更新2 · 27d4cde4
  pengxiong@wealthgrow.cn authored Dec 01, 2020
  
  27d4cde4
- Merge remote-tracking branch 'origin/dev' into dev · 71535598
  pengxiong@wealthgrow.cn authored Dec 01, 2020
```
# Conflicts:
#	logs/tamp_course_order.log
```
  71535598
- 月度回报更新 · fda2a67e
  pengxiong@wealthgrow.cn authored Dec 01, 2020
  
  fda2a67e
- Merge branch 'dev' of E:\project\tamp\fund_report with conflicts. · 2826bea6
  赵杰 authored Dec 01, 2020
  
  2826bea6
- draw更新 · b322e2c8
  pengxiong@wealthgrow.cn authored Dec 01, 2020
  
  b322e2c8
30 Nov, 2020 1 commit
- Merge remote-tracking branch 'origin/dev' into dev · 5b54bce1
  pengxiong@wealthgrow.cn authored Nov 30, 2020
  
  5b54bce1
27 Nov, 2020 8 commits
- 修改市值数据 · 5aa6dde5
  赵杰 authored Nov 27, 2020
  
  5aa6dde5
- 修改净值数据格式 · 29f5f360
  赵杰 authored Nov 27, 2020
  
  29f5f360
- Merge remote-tracking branch 'origin/dev' into dev · d82a0934
  pengxiong@wealthgrow.cn authored Nov 27, 2020
  
  d82a0934
- 添加组合数据到html · f9396627
  赵杰 authored Nov 27, 2020
  
  f9396627
- 修复html模板综述数据 · 5d8b6382
  赵杰 authored Nov 27, 2020
  
  5d8b6382
- 添加jinjia2html.py html_to_pdf.py · f229262f
  wang zhengwei authored Nov 27, 2020
  
  f229262f
- 修改日期bug · 61072755
  赵杰 authored Nov 27, 2020
  
  61072755
- 增加对应指数的结果数据 · 4597d1de
  赵杰 authored Nov 27, 2020
  
  4597d1de