Commits · 7e174a804cd0b50a69a7c83fbb249c75cec7d096 · wangxiaoming / traffic-front

05 Mar, 2019 2 commits
- 文件上传接口及报表上传下载 · 7e174a80
  chase authored Mar 05, 2019
  
  7e174a80
- 修改配置文件 · 725227db
  chase authored Mar 05, 2019
  
  725227db
04 Mar, 2019 8 commits
- 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
- 1、样式fix · 2fac5bcb
  gary authored Mar 04, 2019
  
  2fac5bcb
- 1、样式fixup · 44f462e7
  gary authored Mar 04, 2019
  
  44f462e7
- 1、添加vatpreview默认路由 · 95ab5840
  gary authored Mar 04, 2019
  
  95ab5840
- 1、设置默认路由 · d3db70e6
  gary authored Mar 04, 2019
  
  d3db70e6
- 1、fixbug · 6ccfe028
  gary authored Mar 04, 2019
  
  6ccfe028
02 Mar, 2019 5 commits
- 1、fixbug · 0141cd5d
  gary authored Mar 02, 2019
  
  0141cd5d
- 1、fixbug · 61649b25
  gary authored Mar 02, 2019
  
  61649b25
- 1、数据校验日志 · 8d2b4f76
  gary authored Mar 02, 2019
  
  8d2b4f76
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · d4cf5f97
  gary authored Mar 02, 2019
  
  d4cf5f97
- 1、fix了一半bug · 72475254
  gary authored Mar 02, 2019
  
  72475254
01 Mar, 2019 18 commits
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · b75d1cec
  zhkwei authored Mar 01, 2019
  
  b75d1cec
- CIT数据导入功能模块改bug · 355c5d38
  zhkwei authored Mar 01, 2019
  
  355c5d38
- add admin CIT excel import and resolve some bug----Ken · f09fa1dd
  Ken you authored Mar 01, 2019
  
  f09fa1dd
- 1、css fix · 94eb6b17
  gary authored Mar 01, 2019
  
  94eb6b17
- 1、fixbug · e2b00e71
  gary authored Mar 01, 2019
  
  e2b00e71
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 56122392
  gary authored Mar 01, 2019
  
  56122392
- 1、fixbug · ce95e9d0
  gary authored Mar 01, 2019
```
2、数据处理校验日志20%
```
  ce95e9d0
- CIT数据导入CSS样式更改 · f09cd069
  zhkwei authored Mar 01, 2019
  
  f09cd069
- 1、revert pojo · 4e1f53ea
  gary authored Mar 01, 2019
  
  4e1f53ea
- 1、页脚fix · 82f62db8
  gary authored Mar 01, 2019
  
  82f62db8
- 1、je + tmsPeriod · b890ebc8
  gary authored Mar 01, 2019
  
  b890ebc8
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 3e000f31
  gary authored Mar 01, 2019
  
  3e000f31
- 1、fixbug · 2e20b5dc
  gary authored Mar 01, 2019
  
  2e20b5dc
- CIT数据预览加入state · f1187403
  zhkwei authored Mar 01, 2019
  
  f1187403
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 272ee822
  gary authored Mar 01, 2019
  
  272ee822
- 1、fixbug · 6a7c0f5a
  gary authored Mar 01, 2019
  
  6a7c0f5a
- CIT数据预览 · 81a74e4d
  zhkwei authored Mar 01, 2019
  
  81a74e4d
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · babc14ff
  zhkwei authored Mar 01, 2019
  
  babc14ff
28 Feb, 2019 7 commits
- 1、fixbug · a4d3e404
  gary authored Feb 28, 2019
  
  a4d3e404
- 1、导入表添加projectid、orgid · 6a230bcd
  gary authored Feb 28, 2019
  
  6a230bcd
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · e573dfa9
  gary authored Feb 28, 2019
  
  e573dfa9
- 1、剩余5个表的excel导出 · b39f07d4
  gary authored Feb 28, 2019
```
2、organization_accounting_rate添加source字段
```
  b39f07d4
- 优化开票收入 · 2d7c01a5
  chase authored Feb 28, 2019
  
  2d7c01a5
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 4ad0a8ed
  chase authored Feb 28, 2019
```
# Conflicts:
#	atms-dao/etc/generator-mysql/vatGeneratorConfig.xml
#	atms-web/src/main/webapp/app-resources/i18n/zh-CN/vat.json
```
  4ad0a8ed
- 收入明细功能 · 71669dc5
  chase authored Feb 28, 2019
  
  71669dc5