Commits · d21bfb5412f26192a65905ff53bfbd7b1beda289 · wangxiaoming / traffic-front

22 Mar, 2019 1 commit
- merge 档案管理 · d21bfb54
  chase authored Mar 22, 2019
  
  d21bfb54
21 Mar, 2019 20 commits
- fixbug · 376af30c
  chase authored Mar 21, 2019
  
  376af30c
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 88d15195
  chase authored Mar 21, 2019
  
  88d15195
- 税金计算表功能代码 · b2b88c09
  chase authored Mar 21, 2019
  
  b2b88c09
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 2ebc9c91
  zhkwei authored Mar 21, 2019
  
  2ebc9c91
- CIT固定资产导入bug · a589aa75
  zhkwei authored Mar 21, 2019
  
  a589aa75
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · b2991ee2
  chase authored Mar 21, 2019
  
  b2991ee2
- 税金计算表功能开发 · 606f4439
  chase authored Mar 21, 2019
  
  606f4439
- 1、fix · 8093e0da
  gary authored Mar 21, 2019
  
  8093e0da
- 1、fix red info tab · fb1e99eb
  gary authored Mar 21, 2019
  
  fb1e99eb
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 12b33350
  zhkwei authored Mar 21, 2019
  
  12b33350
- 1、报表模板配置修改；2、卡片及CIT页面显示问题 · 8f252d0a
  zhkwei authored Mar 21, 2019
  
  8f252d0a
- 1、fix · aecbfd2a
  gary authored Mar 21, 2019
  
  aecbfd2a
- 1 · aa5e4c32
  gary authored Mar 21, 2019
  
  aa5e4c32
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 999c9812
  gary authored Mar 21, 2019
  
  999c9812
- 1、fix · af974af5
  gary authored Mar 21, 2019
```
2、添加dd secureToken
```
  af974af5
- fix bug · d3cb3a9a
  eddie.woo authored Mar 21, 2019
  
  d3cb3a9a
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 808cfb09
  eddie.woo authored Mar 21, 2019
  
  808cfb09
- fix bug · 0a860f1a
  eddie.woo authored Mar 21, 2019
  
  0a860f1a
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 7fc4b237
  chase authored Mar 21, 2019
  
  7fc4b237
- merge 档案管理 · 90650fb9
  chase authored Mar 21, 2019
  
  90650fb9
20 Mar, 2019 19 commits
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 1b5a2580
  gary authored Mar 20, 2019
  
  1b5a2580
- 1、fixbug · 0cffbb97
  gary authored Mar 20, 2019
  
  0cffbb97
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 694770d6
  zhkwei authored Mar 20, 2019
  
  694770d6
- CIT--ZC公式完善 · ec6ec56c
  zhkwei authored Mar 20, 2019
  
  ec6ec56c
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 52ffcc3c
  kevin authored Mar 20, 2019
  
  52ffcc3c
- # · 984a7c44
  kevin authored Mar 20, 2019
  
  984a7c44
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 0ec02f5a
  zhkwei authored Mar 20, 2019
  
  0ec02f5a
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 5c02c6ef
  gary authored Mar 20, 2019
  
  5c02c6ef
- 1、fix · ded61099
  gary authored Mar 20, 2019
  
  ded61099
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 3e741063
  zhkwei authored Mar 20, 2019
  
  3e741063
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 22af9c8d
  kevin authored Mar 20, 2019
  
  22af9c8d
- # · 791b42aa
  kevin authored Mar 20, 2019
  
  791b42aa
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 8aba2ab1
  gary authored Mar 20, 2019
  
  8aba2ab1
- 1、fixbug · 68b886f0
  gary authored Mar 20, 2019
  
  68b886f0
- 1、fixbug · bcf788a6
  gary authored Mar 20, 2019
  
  bcf788a6
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 866e8058
  zhkwei authored Mar 20, 2019
  
  866e8058
- CIT报表公式ZC及QMYE · 415f578e
  zhkwei authored Mar 20, 2019
  
  415f578e
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 246af24e
  kevin authored Mar 20, 2019
  
  246af24e
- #bug · c0432c43
  kevin authored Mar 20, 2019
  
  c0432c43