Commits · 913436759898a1aa863991f789bd049c1b2dbbd0 · wangxiaoming / traffic-front

22 Feb, 2019 6 commits
- tb_final · 91343675
  gary authored Feb 22, 2019
  
  91343675
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 6452bee7
  gary authored Feb 22, 2019
  
  6452bee7
- rate update · 3111d014
  gary authored Feb 22, 2019
  
  3111d014
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · a5325903
  chase authored Feb 22, 2019
  
  a5325903
- 添加mapper · 8f1c0940
  chase authored Feb 22, 2019
  
  8f1c0940
- 修改税金公式定位不到数据行时数据的展示效果 · 421756f9
  chase authored Feb 22, 2019
  
  421756f9
21 Feb, 2019 8 commits
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · ac2da005
  eddie.woo authored Feb 21, 2019
  
  ac2da005
- modify · f6cd03e1
  eddie.woo authored Feb 21, 2019
  
  f6cd03e1
- modify · 3ce7ed2b
  eddie.woo authored Feb 21, 2019
  
  3ce7ed2b
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 3b0925a3
  gary authored Feb 21, 2019
  
  3b0925a3
- 1、数据抽取前端 · f7e25c79
  gary authored Feb 21, 2019
```
2、模板下载
```
  f7e25c79
- 修改税金公式支持不传参数 · 3006acfe
  chase authored Feb 21, 2019
  
  3006acfe
- 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 4 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