Commits · 6e3219ad9491f6749d211398229193aa2981fb2a · wangxiaoming / traffic-front · GitLab

24 Apr, 2019 31 commits
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 6e3219ad
  zhkwei authored Apr 24, 2019
  
  6e3219ad
- 1、资产导入本年折旧额根据年限改动；2、ZC公式报错问题 · 5192642d
  zhkwei authored Apr 24, 2019
  
  5192642d
- 桔子堆样式 · fa3ea239
  sam.x.wang authored Apr 24, 2019
  
  fa3ea239
- fix bug · 7581899c
  chase authored Apr 24, 2019
  
  7581899c
- fix bug · d0fa9ca2
  chase authored Apr 24, 2019
  
  d0fa9ca2
- merge 档案管理 · 1ded7713
  chase authored Apr 24, 2019
  
  1ded7713
- Merge branch 'dev_mysql' of https://gitee.com/Memorydoc/atms into dev_mysql · e8c23e36
  kevin authored Apr 24, 2019
  
  e8c23e36
- fix · ce7e50b6
  Memorydoc authored Apr 24, 2019
  
  ce7e50b6
- 多余的修改还原 · b72420dd
  sam.x.wang authored Apr 24, 2019
  
  b72420dd
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 8e5384bb
  kevin authored Apr 24, 2019
  
  8e5384bb
- Merge branch 'dev_mysql' of https://gitee.com/Memorydoc/atms into dev_mysql · 948c5553
  kevin authored Apr 24, 2019
  
  948c5553
- 桔子堆问题 · ad95c12e
  sam.x.wang authored Apr 24, 2019
  
  ad95c12e
- # · 6ee4f878
  Memorydoc authored Apr 24, 2019
  
  6ee4f878
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 809571b0
  eddie.woo authored Apr 24, 2019
  
  809571b0
- fix · ad1e5c42
  eddie.woo authored Apr 24, 2019
  
  ad1e5c42
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 62ae1c98
  chase authored Apr 24, 2019
  
  62ae1c98
- fix bug · c9ca1340
  chase authored Apr 24, 2019
  
  c9ca1340
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 662ee90a
  zhkwei authored Apr 24, 2019
  
  662ee90a
- 1、机构管理-股权信息标签显示完全；2、固资导入支持手动修改年限 · 5241a337
  zhkwei authored Apr 24, 2019
  
  5241a337
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 0de392d6
  eddie.woo authored Apr 24, 2019
  
  0de392d6
- bpmn · b695bff4
  eddie.woo authored Apr 24, 2019
  
  b695bff4
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 69aab9f3
  chase authored Apr 24, 2019
  
  69aab9f3
- fix bug · 53b2f354
  chase authored Apr 24, 2019
  
  53b2f354
- mybatis generator · 91a4b126
  eddie.woo authored Apr 24, 2019
  
  91a4b126
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 1957abfc
  eddie.woo authored Apr 24, 2019
  
  1957abfc
- modify · 1da338ac
  eddie.woo authored Apr 24, 2019
  
  1da338ac
- fix box close bug---Ken · f182be29
  ken.q.you authored Apr 24, 2019
  
  f182be29
- fix 已完成 bug ---Ken · 01f0f00b
  ken.q.you authored Apr 24, 2019
  
  01f0f00b
- 修改gift上传失效时间-2天 · 0bfe3782
  chase authored Apr 24, 2019
  
  0bfe3782
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 673007bb
  chase authored Apr 24, 2019
  
  673007bb
- merge 档案管理 · 8c1745f2
  chase authored Apr 24, 2019
  
  8c1745f2
23 Apr, 2019 9 commits
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 164b07be
  zhkwei authored Apr 23, 2019
  
  164b07be
- 1、固资导入；2、固资损失计算；3、汇率记录条数；4、调整日记账导入模板及bug;5、总分机构分配表小部分优化 · bb9da620
  zhkwei authored Apr 23, 2019
  
  bb9da620
- 查询重置问题 · c54b121a
  sam.x.wang authored Apr 23, 2019
  
  c54b121a
- # · feb5086b
  kevin authored Apr 23, 2019
  
  feb5086b
- # · c6c757ed
  kevin authored Apr 23, 2019
  
  c6c757ed
- 去掉workflow老接口 · dfcca34c
  eddie.woo authored Apr 23, 2019
  
  dfcca34c
- # · b5b1cadf
  Memorydoc authored Apr 23, 2019
  
  b5b1cadf
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 8f6e1f5e
  eddie.woo authored Apr 23, 2019
  
  8f6e1f5e
- cash flow 排序 · d1139637
  eddie.woo authored Apr 23, 2019
  
  d1139637