Commits · 3176930dd3688bd84aca8f0a45dd22ef588a9a5f · wangxiaoming / traffic-front

28 Apr, 2019 9 commits
- Merge branch 'dev_wzk' into 'dev_mysql' · 3176930d
  Eddie.Wu authored Apr 28, 2019
```
1、总分机构分配比例；2、发票记录导出模板

See merge request root/atms!346
```
  3176930d
- Merge branch 'dev_mysql_chase' into 'dev_mysql' · 87ff881f
  Eddie.Wu authored Apr 28, 2019
```
fix 报表导出无法导出字符串bug

See merge request root/atms!345
```
  87ff881f
- 配置文件修改 · 672c050a
  eddie.woo authored Apr 28, 2019
  
  672c050a
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_wzk · abda5873
  zhkwei authored Apr 28, 2019
  
  abda5873
- 1、总分机构分配比例；2、发票记录导出模板； · 128e337d
  zhkwei authored Apr 28, 2019
  
  128e337d
- fix 报表导出无法导出字符串bug · d53e31a3
  chase authored Apr 28, 2019
  
  d53e31a3
- Merge branch 'dev_mysql_chase' into 'dev_mysql' · 68117049
  Eddie.Wu authored Apr 28, 2019
```
fix bug

See merge request root/atms!344
```
  68117049
- fix bug · 7bdb4388
  chase authored Apr 28, 2019
  
  7bdb4388
- 1、VAT资产负债及发票记录模板下载的模板；2、固资筛选框还原...;3、添加收入类型配置代码优化 · a6abc899
  zhkwei authored Apr 28, 2019
  
  a6abc899
27 Apr, 2019 2 commits
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 274fb537
  eddie.woo authored Apr 27, 2019
  
  274fb537
- fix gift有效期 · 91f58893
  eddie.woo authored Apr 27, 2019
  
  91f58893
26 Apr, 2019 8 commits
- Merge branch 'dev_wzk' into 'dev_mysql' · 11c870af
  Administrator authored Apr 26, 2019
```
1、固资损失把隐藏列显示出来；2、固资导入界面优化；3、财务数据抽取及数据导入记录页面只有admin查看全部及页面Grid高度变化；4、收入类型配置机构和名称组成唯一并更改Grid高度变化

See merge request root/atms!342
```
  11c870af
- Merge branch 'dev_kevin' into 'dev_mysql' · bfca9714
  Administrator authored Apr 26, 2019
```
Dev kevin

See merge request root/atms!341
```
  bfca9714
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_wzk · ffd3b7d5
  zhkwei authored Apr 26, 2019
  
  ffd3b7d5
- 1、固资损失把隐藏列显示出来；2、固资导入界面优化；3、财务数据抽取及数据导入记录页面只有admin查看全部及页面Grid高度变化；4、收入类型配置机构和名称组成唯一并更改Grid高度变化 · 0df803d4
  zhkwei authored Apr 26, 2019
  
  0df803d4
- Merge branch 'dev_mysql' of https://gitee.com/Memorydoc/atms into dev_kevin · ae27ceb5
  kevin authored Apr 26, 2019
  
  ae27ceb5
- 邮箱邮件拉去 · 48a2be64
  Memorydoc authored Apr 26, 2019
  
  48a2be64
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · fb2e3aab
  Memorydoc authored Apr 26, 2019
  
  fb2e3aab
- Merge branch 'dev_mysql_chase' into 'dev_mysql' · f9fcba59
  Administrator authored Apr 26, 2019
```
fix KPSR bug

See merge request root/atms!340
```
  f9fcba59
25 Apr, 2019 21 commits
- fix KPSR bug · 1986138d
  chase authored Apr 25, 2019
  
  1986138d
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_wzk · 053a7f98
  zhkwei authored Apr 25, 2019
  
  053a7f98
- 财务数据抽取和数据导入记录除了admin只能看到自己的操作记录 · 43a230e1
  zhkwei authored Apr 25, 2019
  
  43a230e1
- Merge branch 'dev_sam' into 'dev_mysql' · 239d866c
  Administrator authored Apr 25, 2019
```
修改标题

See merge request root/atms!338
```
  239d866c
- Merge branch 'dev_wzk' into 'dev_mysql' · b9e81e7d
  Administrator authored Apr 25, 2019
```
1、ZC公式数据源问题；2、RSUMIF取CIT利润表数据源问题；3、已开增值税发票记录模板必填高亮问题；4、收入类型配置操作列移到前面，并提示名称唯一改为警告提示；

See merge request root/atms!337
```
  b9e81e7d
- 修改标题 · 1d6c5125
  sam.x.wang authored Apr 25, 2019
  
  1d6c5125
- 1、ZC公式数据源问题；2、RSUMIF取CIT利润表数据源问题；3、已开增值税发票记录模板必填高亮问题；4、收入类型配置操作列移到前面，并提示名称唯一改为警告提示； · 70476bbe
  zhkwei authored Apr 25, 2019
  
  70476bbe
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_sam · 0d00fffb
  sam.x.wang authored Apr 25, 2019
  
  0d00fffb
- Revert "push" · 02092f5c
  sam.x.wang authored Apr 25, 2019
```
This reverts commit d55f2858.
```
  02092f5c
- push · d55f2858
  sam.x.wang authored Apr 25, 2019
  
  d55f2858
- 没用的修改 · 428b62c8
  sam.x.wang authored Apr 25, 2019
  
  428b62c8
- # · 2ac8011b
  Memorydoc authored Apr 25, 2019
  
  2ac8011b
- Merge branch 'dev_wzk' into 'dev_mysql' · 0a2494a2
  Administrator authored Apr 25, 2019
```
Dev wzk

See merge request root/atms!336
```
  0a2494a2
- Merge branches 'dev_mysql' and 'dev_wzk' of… · 65dd9937
  zhkwei authored Apr 25, 2019
```
Merge branches 'dev_mysql' and 'dev_wzk' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_wzk
```
  65dd9937
- Merge branch 'dev_mysql_chase' into 'dev_mysql' · ea1d1d24
  Administrator authored Apr 25, 2019
```
fix bug

See merge request root/atms!335
```
  ea1d1d24
- fix bug · 28fc699e
  chase authored Apr 25, 2019
  
  28fc699e
- 调整表导入index不对问题 · 3f84cc7b
  eddie.woo authored Apr 25, 2019
  
  3f84cc7b
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_wzk · 565b1c69
  zhkwei authored Apr 25, 2019
```
# Conflicts:
#	atms-web/src/main/webapp/app/framework/app-nav/app-nav.html
```
  565b1c69
- 1、ZC公式fixbug；2、修改TAX PLATPAM为DIDI... · b5a9d4d0
  zhkwei authored Apr 25, 2019
  
  b5a9d4d0
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · cbf41afd
  kevin authored Apr 25, 2019
  
  cbf41afd
- Merge branch 'dev_mysql' of https://gitee.com/Memorydoc/atms into dev_mysql · 165c9b36
  kevin authored Apr 25, 2019
```
# Conflicts:
#	atms-api/src/main/java/pwc/taxtech/atms/service/impl/DataImportService.java
```
  165c9b36