Commits · 2caf2528e0df9134e7964b513bde49e9fcb84b6d · wangxiaoming / traffic-front

21 Feb, 2019 2 commits
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 2caf2528
  chase authored Feb 21, 2019
  
  2caf2528
- 新增税金计算公式（按type定位） · ea289174
  chase authored Feb 21, 2019
  
  ea289174
20 Feb, 2019 12 commits
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 31e382e2
  gary authored Feb 20, 2019
  
  31e382e2
- 1、fixbug · 3db150f2
  gary authored Feb 20, 2019
```
2、添加excel导入机构筛选
```
  3db150f2
- modify · d0f6bbe2
  eddie.woo authored Feb 20, 2019
  
  d0f6bbe2
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 03000ff9
  chase authored Feb 20, 2019
  
  03000ff9
- merge · 7e67c133
  eddie.woo authored Feb 20, 2019
  
  7e67c133
- modify · f6e95b16
  eddie.woo authored Feb 20, 2019
  
  f6e95b16
- 新增查询模板方法 · 1fd33481
  chase authored Feb 20, 2019
  
  1fd33481
- 新增税金公式 · 8bdc79b3
  chase authored Feb 20, 2019
  
  8bdc79b3
- 新增税金公式 · 94d00491
  chase authored Feb 20, 2019
  
  94d00491
- add test ebs je api ---Ken · bec57933
  Ken you authored Feb 20, 2019
  
  bec57933
- 新增税金查询公式(按名字) · 039db78b
  chase authored Feb 20, 2019
  
  039db78b
- add ebs JournalEntry api ---Ken · b9fcb4da
  Ken you authored Feb 20, 2019
  
  b9fcb4da
19 Feb, 2019 2 commits
- fix vat cash flow view---Ken · 68f705b9
  Ken you authored Feb 19, 2019
  
  68f705b9
- 1、发票资料、导入记录等 · 59e0d05f
  gary authored Feb 19, 2019
```
2、fixbug
```
  59e0d05f
18 Feb, 2019 2 commits
- fixbug · 017a7865
  gary authored Feb 18, 2019
  
  017a7865
- 1、发票资料、等 · 7daf47a4
  gary authored Feb 18, 2019
  
  7daf47a4
16 Feb, 2019 2 commits
- fixbug · 87249bb6
  gary authored Feb 16, 2019
  
  87249bb6
- 1、红字信息表、调整表 excel导入 · 57228a73
  gary authored Feb 16, 2019
  
  57228a73
15 Feb, 2019 3 commits
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 906776ce
  gary authored Feb 15, 2019
```
# Conflicts:
#	atms-api/src/main/java/pwc/taxtech/atms/controller/DataImportController.java
```
  906776ce
- 1、vat excel导入相关 · 7c08e419
  gary authored Feb 15, 2019
  
  7c08e419
- 测试环境配置 · f0cad188
  eddie.woo authored Feb 15, 2019
  
  f0cad188
14 Feb, 2019 1 commit
- add vat cash flow table and web ---Ken · e6509676
  Ken you authored Feb 14, 2019
  
  e6509676
12 Feb, 2019 9 commits
- Merge branch 'dev_mysql' of code.tech.tax.asia.pwcinternal.com:root/atms into dev_mysql · ed22419b
  gary authored Feb 12, 2019
  
  ed22419b
- 添加导入入口 · e05f439f
  gary authored Feb 12, 2019
  
  e05f439f
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · efa8a3e2
  eddie.woo authored Feb 12, 2019
  
  efa8a3e2
- Delete DistributedIDService.java · c272b204
  Administrator authored Feb 12, 2019
  
  c272b204
- modify · 43500513
  eddie.woo authored Feb 12, 2019
  
  43500513
- modify · 405190ef
  eddie.woo authored Feb 12, 2019
  
  405190ef
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · b5f407d2
  eddie.woo authored Feb 12, 2019
  
  b5f407d2
- 编译调整 · 8c497906
  eddie.woo authored Feb 12, 2019
  
  8c497906
- update gruntfile app to scripts---Ken · 79b3eaa1
  Ken you authored Feb 12, 2019
  
  79b3eaa1
11 Feb, 2019 3 commits
- fixbug · 7ef966a4
  gary authored Feb 11, 2019
  
  7ef966a4
- fixbug · f94490dd
  gary authored Feb 11, 2019
  
  f94490dd
- 1、科目余额表、资产负债表、利润表、日记账数据预览、条件查询及导出 · 4d7c9711
  gary authored Feb 11, 2019
  
  4d7c9711
03 Feb, 2019 3 commits
- fix .json bug---Ken · 3f5ea0b4
  Ken you authored Feb 03, 2019
  
  3f5ea0b4
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · dc88ffd1
  gary authored Feb 03, 2019
```
# Conflicts:
#	atms-web/src/main/webapp/app-resources/i18n/zh-CN/vat.json
```
  dc88ffd1
- db url change · 9cd44d6f
  gary authored Feb 03, 2019
  
  9cd44d6f
02 Feb, 2019 1 commit
- modify · dac479fd
  eddie.woo authored Feb 02, 2019
  
  dac479fd