Commits · 017b4e17858194280ca26af78dcdbcc33be1c750 · wangxiaoming / traffic-front

27 Feb, 2019 12 commits
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 017b4e17
  zhkwei authored Feb 27, 2019
```
# Conflicts:
#	atms-web/src/main/webapp/app/common/utils/constant.js
```
  017b4e17
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 3d9a5639
  eddie.woo authored Feb 27, 2019
  
  3d9a5639
- 配置修改 · 0e9d8280
  eddie.woo authored Feb 27, 2019
  
  0e9d8280
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 67c59911
  gary authored Feb 27, 2019
  
  67c59911
- 1、数据导入菜单添加中英文 · 9d96d91b
  gary authored Feb 27, 2019
```
2、fixbug
```
  9d96d91b
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 02cb5205
  eddie.woo authored Feb 27, 2019
  
  02cb5205
- 1.spreedJs license;2.开票映射 · 5c41d6eb
  eddie.woo authored Feb 27, 2019
  
  5c41d6eb
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · bf945c3a
  chase authored Feb 27, 2019
```
# Conflicts:
#	atms-web/src/main/webapp/app-resources/i18n/zh-CN/vat.json
```
  bf945c3a
- 收入明细功能 · 7735b088
  chase authored Feb 27, 2019
  
  7735b088
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · fcf65a28
  kevin authored Feb 27, 2019
  
  fcf65a28
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · c017162f
  kevin authored Feb 27, 2019
```
# Conflicts:
#	atms-web/src/main/webapp/app/vat/reduction/vat-caculate-data/vat-caculate-data.ctrl.js
```
  c017162f
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · daef7105
  kevin authored Feb 27, 2019
```
# Conflicts:
#	atms-web/src/main/webapp/app/vat/reduction/vat-caculate-data/vat-caculate-data.ctrl.js
```
  daef7105
26 Feb, 2019 9 commits
- 1、导入记录添加分页 · f7a8d289
  gary authored Feb 26, 2019
```
2、fixbug
3、机构信息初始化
```
  f7a8d289
- CIT数据导入模块补充选择机构及期间功能 · 2c77ebfc
  zhkwei authored Feb 26, 2019
  
  2c77ebfc
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 68e3be21
  zhkwei authored Feb 26, 2019
  
  68e3be21
- 收入明细功能代码 · ce3ea281
  chase authored Feb 26, 2019
  
  ce3ea281
- uodate ebs api url ----Ken · 054317bd
  Ken you authored Feb 26, 2019
  
  054317bd
- # · 5aeb1221
  kevin authored Feb 26, 2019
  
  5aeb1221
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 4e7b0b1e
  zhkwei authored Feb 26, 2019
  
  4e7b0b1e
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · b27e0d44
  eddie.woo authored Feb 26, 2019
  
  b27e0d44
- modify · 63e7b2c3
  eddie.woo authored Feb 26, 2019
  
  63e7b2c3
25 Feb, 2019 12 commits
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 07ed4dac
  zhkwei authored Feb 25, 2019
```
# Conflicts:
#	atms-web/src/main/webapp/app/common/utils/constant.js
```
  07ed4dac
- CIT数据导入模板下载功能补充 · fdc87c68
  zhkwei authored Feb 25, 2019
  
  fdc87c68
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · b50a3f69
  gary authored Feb 25, 2019
  
  b50a3f69
- 1、fixbug 功能优化 · 7aa072d6
  gary authored Feb 25, 2019
  
  7aa072d6
- modify · d8e9c629
  eddie.woo authored Feb 25, 2019
  
  d8e9c629
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · e235c0bc
  eddie.woo authored Feb 25, 2019
  
  e235c0bc
- 修改js · 64c3bbd1
  ZeGang Z Si authored Feb 25, 2019
  
  64c3bbd1
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 591f7a96
  eddie.woo authored Feb 25, 2019
  
  591f7a96
- modify · 05887d75
  eddie.woo authored Feb 25, 2019
  
  05887d75
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · e57197df
  zhkwei authored Feb 25, 2019
```
# Conflicts:
#	atms-api/src/main/java/pwc/taxtech/atms/service/impl/FileService.java
```
  e57197df
- CIT数据导入功能模块 · 23b09c1a
  zhkwei authored Feb 25, 2019
  
  23b09c1a
- update jxls excel export---Ken · e200f4c5
  Ken you authored Feb 25, 2019
  
  e200f4c5
24 Feb, 2019 2 commits
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · d31ce086
  ZeGang Z Si authored Feb 24, 2019
  
  d31ce086
- #附件上传 · ca50112f
  ZeGang Z Si authored Feb 24, 2019
  
  ca50112f
23 Feb, 2019 2 commits
- fixbug · 6eb6dfe5
  gary authored Feb 23, 2019
  
  6eb6dfe5
- 1、添加四张表的数据预览（导出待做） · 52bc9b41
  gary authored Feb 23, 2019
```
2、fixbug
```
  52bc9b41
22 Feb, 2019 3 commits
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 097ae99c
  zhkwei authored Feb 22, 2019
```
# Conflicts:
#	atms-web/src/main/webapp/Scripts/module-part2.js
#	atms-web/src/main/webapp/app/common/controls/import/import-cit-journal-adjust/import-cit-journal-adjust.ctrl.js
```
  097ae99c
- CIT数据导入功能模块 · 618f7876
  zhkwei authored Feb 22, 2019
  
  618f7876
- fixbug · 772a2824
  gary authored Feb 22, 2019
  
  772a2824