Commits · 1e9d27f27b86fed994e8c6c1f8d3fbbdc0cb3c8e · wangxiaoming / traffic-front

16 Mar, 2019 8 commits
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 1e9d27f2
  gary authored Mar 16, 2019
  
  1e9d27f2
- 1、数据抽取 · a1399503
  gary authored Mar 16, 2019
```
2、fixbug
```
  a1399503
- # · 86a8faee
  kevin authored Mar 16, 2019
  
  86a8faee
- # · c897feee
  kevin authored Mar 16, 2019
  
  c897feee
- # · 7c569771
  kevin authored Mar 16, 2019
  
  7c569771
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 337ffed7
  chase authored Mar 16, 2019
  
  337ffed7
- 税金计算表功能 · d772e68a
  chase authored Mar 16, 2019
  
  d772e68a
- merge 档案管理 · fb049e40
  chase authored Mar 16, 2019
  
  fb049e40
15 Mar, 2019 29 commits
- 1、fixbug · c6bee104
  gary authored Mar 15, 2019
  
  c6bee104
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · cc4c112b
  gary authored Mar 15, 2019
  
  cc4c112b
- 1、fixbug · f4c3950e
  gary authored Mar 15, 2019
```
2、添加国家字段
```
  f4c3950e
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · acb91a82
  kevin authored Mar 15, 2019
  
  acb91a82
- # · b3a823d3
  kevin authored Mar 15, 2019
  
  b3a823d3
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · beb634a5
  zhkwei authored Mar 15, 2019
  
  beb634a5
- CIT查看报表 · df97e9f6
  zhkwei authored Mar 15, 2019
  
  df97e9f6
- CIT查看报表bug · 8da13e56
  zhkwei authored Mar 15, 2019
  
  8da13e56
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 9f294850
  kevin authored Mar 15, 2019
  
  9f294850
- # · e6f5468d
  kevin authored Mar 15, 2019
  
  e6f5468d
- CIT查看报表修改bug · e13c5c4a
  zhkwei authored Mar 15, 2019
  
  e13c5c4a
- 1、fixbug · 52339216
  gary authored Mar 15, 2019
  
  52339216
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 4d5edd4c
  kevin authored Mar 15, 2019
  
  4d5edd4c
- # · 6f213aef
  kevin authored Mar 15, 2019
  
  6f213aef
- CITbug修改 · cd6ace09
  zhkwei authored Mar 15, 2019
  
  cd6ace09
- update cashFlow search contion---Ken · 29c57efe
  Ken you authored Mar 15, 2019
  
  29c57efe
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 7ab29d95
  gary authored Mar 15, 2019
  
  7ab29d95
- 1、fixbug · d077b460
  gary authored Mar 15, 2019
  
  d077b460
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 3a96d22f
  zhkwei authored Mar 15, 2019
  
  3a96d22f
- CIT页面优化及bug修改 · ef91da76
  zhkwei authored Mar 15, 2019
  
  ef91da76
- 。。 · 5710dcc4
  gary authored Mar 15, 2019
  
  5710dcc4
- 1、机构同步添加分页参数 · f8c5dd78
  gary authored Mar 15, 2019
  
  f8c5dd78
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · bc87266e
  gary authored Mar 15, 2019
  
  bc87266e
- 1、fixbug · b2196fef
  gary authored Mar 15, 2019
```
2、用户导出
```
  b2196fef
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 33578ccf
  chase authored Mar 15, 2019
  
  33578ccf
- 修改admin报表模板上传滴滴服务器且页面选择报表类型 · e1326021
  chase authored Mar 15, 2019
  
  e1326021
- 1、fixbug maven dependency add · f3a9dcc7
  gary authored Mar 15, 2019
  
  f3a9dcc7
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 80e5a036
  gary authored Mar 15, 2019
  
  80e5a036
- 1、fixbug · b4f3bdf6
  gary authored Mar 15, 2019
```
2、分析数据导入的导出
```
  b4f3bdf6
14 Mar, 2019 3 commits
- merge · 4bf2c10e
  eddie.woo authored Mar 14, 2019
  
  4bf2c10e
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · acf7968e
  eddie.woo authored Mar 14, 2019
```
# Conflicts:
#	atms-api/src/main/java/pwc/taxtech/atms/service/impl/OrganizationServiceImpl.java
#	atms-dao/src/main/java/pwc/taxtech/atms/dao/OrganizationMapper.java
```
  acf7968e
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 025ef438
  chase authored Mar 14, 2019
  
  025ef438