Commits · 16f4235957d43f1df739c30f5fe3648bffcd1a24 · wangxiaoming / traffic-front

06 Mar, 2019 6 commits
- 1、fixbug · 16f42359
  gary authored Mar 06, 2019
  
  16f42359
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 2e1c2f4b
  kevin authored Mar 06, 2019
  
  2e1c2f4b
- # · fc5c7c68
  kevin authored Mar 06, 2019
  
  fc5c7c68
- 报表文件上传归档功能 · 1f403a54
  chase authored Mar 06, 2019
  
  1f403a54
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 506dce2c
  chase authored Mar 06, 2019
  
  506dce2c
- fix bug · de5fbc39
  chase authored Mar 06, 2019
  
  de5fbc39
05 Mar, 2019 18 commits
- update ebs api ---Ken · 1c7bd322
  Ken you authored Mar 05, 2019
  
  1c7bd322
- 1、trialbalance 加tmsPeriod字段 · 2ec1a50e
  gary authored Mar 05, 2019
```
2、orgInit更新
```
  2ec1a50e
- 修改配置文件 · 06dfa4a5
  chase authored Mar 05, 2019
  
  06dfa4a5
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 3bf7991e
  chase authored Mar 05, 2019
  
  3bf7991e
- 文件上传接口及报表上传下载 · 7e174a80
  chase authored Mar 05, 2019
  
  7e174a80
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · eb2d4b94
  gary authored Mar 05, 2019
  
  eb2d4b94
- 1、fixbug · 5e0594ae
  gary authored Mar 05, 2019
  
  5e0594ae
- $ · 4c02c4a2
  kevin authored Mar 05, 2019
  
  4c02c4a2
- # · fbeb6d31
  kevin authored Mar 05, 2019
  
  fbeb6d31
- 修改配置文件 · 725227db
  chase authored Mar 05, 2019
  
  725227db
- 1、fixbug · 7b8df0b0
  gary authored Mar 05, 2019
  
  7b8df0b0
- 1、fixbug · d060add7
  gary authored Mar 05, 2019
  
  d060add7
- 1、fixbug · 1235d4d6
  gary authored Mar 05, 2019
  
  1235d4d6
- 1、汇率表添加数据日期字段 · 3397ae4f
  gary authored Mar 05, 2019
  
  3397ae4f
- 1、fixbug · f6d05123
  gary authored Mar 05, 2019
  
  f6d05123
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · e1fe75cf
  gary authored Mar 05, 2019
  
  e1fe75cf
- 1、默认新建用户归属滴滴集团 · d0fa4d2c
  gary authored Mar 05, 2019
  
  d0fa4d2c
- add delete origin data ---Ken · 2b17e796
  Ken you authored Mar 05, 2019
  
  2b17e796
04 Mar, 2019 16 commits
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · fc03f870
  kevin authored Mar 04, 2019
  
  fc03f870
- # · 55cd8969
  kevin authored Mar 04, 2019
  
  55cd8969
- resolve CONFLICT ----Ken · 8838e28b
  Ken you authored Mar 04, 2019
  
  8838e28b
- CIT数据预览-日记账。试算平衡表相关功能 · 74f01fd9
  zhkwei authored Mar 04, 2019
  
  74f01fd9
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · da886edd
  kevin authored Mar 04, 2019
  
  da886edd
- # · 225a32cf
  kevin authored Mar 04, 2019
  
  225a32cf
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 6926c9d3
  gary authored Mar 04, 2019
  
  6926c9d3
- 1、添加长度校验 · 8d5e7ef3
  gary authored Mar 04, 2019
  
  8d5e7ef3
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 679c47fb
  kevin authored Mar 04, 2019
  
  679c47fb
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · dfb937a0
  kevin authored Mar 04, 2019
```
# Conflicts:
#	atms-web/src/main/webapp/app/vat/reduction/vat-caculate-data/vat-caculate-data.ctrl.js
```
  dfb937a0
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 2400ecf5
  gary authored Mar 04, 2019
  
  2400ecf5
- 1、fixbug · cc4c846f
  gary authored Mar 04, 2019
  
  cc4c846f
- 1、机构接口 · da324458
  gary authored Mar 04, 2019
  
  da324458
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · f6962817
  chase authored Mar 04, 2019
  
  f6962817
- 新增上传文件接口 · 4b212884
  chase authored Mar 04, 2019
  
  4b212884
- 1、样式fix · 2e39bfb5
  gary authored Mar 04, 2019
  
  2e39bfb5