Commits · e68f97abac53c821f9443927d27532473cf3a2ce · wangxiaoming / traffic-front

02 Mar, 2019 2 commits
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · e68f97ab
  kevin authored Mar 02, 2019
```
# Conflicts:
#	atms-web/src/main/webapp/app/vat/reduction/vat-caculate-data/vat-caculate-data.ctrl.js
```
  e68f97ab
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 773b16bb
  kevin authored Mar 02, 2019
```
# Conflicts:
#	atms-web/src/main/webapp/app/vat/reduction/vat-caculate-data/vat-caculate-data.ctrl.js
```
  773b16bb
01 Mar, 2019 10 commits
- 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 11 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
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · c1ab40d8
  gary authored Feb 28, 2019
  
  c1ab40d8
- 1、发票资料预览 · f668ad7e
  gary authored Feb 28, 2019
```
2、fixbug
```
  f668ad7e
- CIT数据导入试算平衡表自动生成功能及整体优化 · 4c3cf747
  zhkwei authored Feb 28, 2019
  
  4c3cf747
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · b5602edb
  zhkwei authored Feb 28, 2019
```
# Conflicts:
#	atms-web/src/main/webapp/app/common/utils/constant.js
```
  b5602edb
27 Feb, 2019 17 commits
- add cit 查看报表缺失文件---Ken · 81d221b7
  Ken you authored Feb 27, 2019
  
  81d221b7
- 1、fixbug · 0d4a1072
  gary authored Feb 27, 2019
  
  0d4a1072
- 1、fixbug · 0f65d57f
  gary authored Feb 27, 2019
  
  0f65d57f
- 1、vatSession里添加了orgTree · e1c0082b
  gary authored Feb 27, 2019
```
2、补充了excel导入的四个机构选择
```
  e1c0082b
- 1、db结构sql备份 · 403f81f9
  gary authored Feb 27, 2019
  
  403f81f9
- 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