Commits · 07fd90721e19a27c8851dac5e2c65c9d6bcf1af5 · wangxiaoming / traffic-front

14 Feb, 2019 3 commits
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 07fd9072
  zhkwei authored Feb 14, 2019
  
  07fd9072
- CIT固定资产-导入、资产清单补充及优化 · 23766b40
  zhkwei authored Feb 14, 2019
  
  23766b40
- add vat cash flow table and web ---Ken · e6509676
  Ken you authored Feb 14, 2019
  
  e6509676
13 Feb, 2019 1 commit
- CIT固定资产-配置、导入、资产清单 · 905dfd13
  zhkwei authored Feb 13, 2019
  
  905dfd13
12 Feb, 2019 7 commits
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · efa8a3e2
  eddie.woo authored Feb 12, 2019
  
  efa8a3e2
- Delete DistributedIDService.java · c272b204
  Administrator authored Feb 12, 2019
  
  c272b204
- modify · 43500513
  eddie.woo authored Feb 12, 2019
  
  43500513
- modify · 405190ef
  eddie.woo authored Feb 12, 2019
  
  405190ef
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · b5f407d2
  eddie.woo authored Feb 12, 2019
  
  b5f407d2
- 编译调整 · 8c497906
  eddie.woo authored Feb 12, 2019
  
  8c497906
- update gruntfile app to scripts---Ken · 79b3eaa1
  Ken you authored Feb 12, 2019
  
  79b3eaa1
11 Feb, 2019 3 commits
- fixbug · 7ef966a4
  gary authored Feb 11, 2019
  
  7ef966a4
- fixbug · f94490dd
  gary authored Feb 11, 2019
  
  f94490dd
- 1、科目余额表、资产负债表、利润表、日记账数据预览、条件查询及导出 · 4d7c9711
  gary authored Feb 11, 2019
  
  4d7c9711
03 Feb, 2019 3 commits
- fix .json bug---Ken · 3f5ea0b4
  Ken you authored Feb 03, 2019
  
  3f5ea0b4
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · dc88ffd1
  gary authored Feb 03, 2019
```
# Conflicts:
#	atms-web/src/main/webapp/app-resources/i18n/zh-CN/vat.json
```
  dc88ffd1
- db url change · 9cd44d6f
  gary authored Feb 03, 2019
  
  9cd44d6f
02 Feb, 2019 1 commit
- modify · dac479fd
  eddie.woo authored Feb 02, 2019
  
  dac479fd
01 Feb, 2019 1 commit
- 1、fixbug · 5ad5aabe
  gary authored Feb 01, 2019
```
2、vat数据预览-科目余额表
```
  5ad5aabe
30 Jan, 2019 3 commits
- add switch language ---Ken · 3d20d488
  Ken you authored Jan 30, 2019
  
  3d20d488
- show cit web menu ---Ken · b9f36bc9
  Ken you authored Jan 30, 2019
  
  b9f36bc9
- fixbug · ee0af30b
  gary authored Jan 30, 2019
  
  ee0af30b
29 Jan, 2019 2 commits
- fixbug · 135f46f1
  gary authored Jan 29, 2019
  
  135f46f1
- 1、字段修改 · ea31f7a0
  gary authored Jan 29, 2019
```
2、税务信息添加雇员、资格信息
3、添加国际化校验，显示不同字段
```
  ea31f7a0
25 Jan, 2019 3 commits
- 修复token中不允许有空字符串的bug · 448f2dae
  gary authored Jan 25, 2019
  
  448f2dae
- 1、后端权限由数据库中查询 · d17fa4b4
  gary authored Jan 25, 2019
```
2、任何角色变更时，都会将对应的用户权限缓存清除
3、role的curd都在缓存上进行
```
  d17fa4b4
- 1、补充baseEntity · 7f32ff64
  gary authored Jan 25, 2019
  
  7f32ff64
24 Jan, 2019 4 commits
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · fee7ba9b
  gary authored Jan 24, 2019
  
  fee7ba9b
- 1、机构管理中的其他信息修改为税务信息 · 26cb676d
  gary authored Jan 24, 2019
```
2、机构管理 机构列表设置默认隐藏的列
3、机构管理中的 其他信息 添加全部展开和折叠按钮
4、区域为国际化修改了省 可空逻辑

// todo
1、机构国际化修改
2、股东搜索机构
```
  26cb676d
- add cit web ----Ken · 3589c48d
  Ken you authored Jan 24, 2019
  
  3589c48d
- 1、其他信息补充日志 · 57378487
  gary authored Jan 24, 2019
```
// todo
1、机构国际化修改
```
  57378487
23 Jan, 2019 3 commits
- 1、前端表单调整 · 95d03507
  gary authored Jan 23, 2019
```
// todo
1、机构国际化修改
2、其他信息补充日志
```
  95d03507
- Merge branch 'dev_mysql' of code.tech.tax.asia.pwcinternal.com:root/atms into dev_mysql · b3ee68f4
  gary authored Jan 23, 2019
  
  b3ee68f4
- 1、机构管理内容新增 · f080966c
  gary authored Jan 23, 2019
```
// todo
1、机构国际化修改
2、其他信息补充日志
3、前端表单调整
```
  f080966c
22 Jan, 2019 1 commit
- modify · a1b8013f
  eddie.woo authored Jan 22, 2019
  
  a1b8013f
18 Jan, 2019 1 commit
- add serialize · 2d167771
  eddie.woo authored Jan 18, 2019
  
  2d167771
11 Jan, 2019 1 commit
- 1、fix 日志记录读取bug · ae60b757
  gary authored Jan 11, 2019
  
  ae60b757
10 Jan, 2019 2 commits
- 1、添加股权修改、变更的页面 · cc5d91a2
  gary authored Jan 10, 2019
```
2、sqldebug
```
  cc5d91a2
- 1、添加机构导出 · 4cf57147
  gary authored Jan 10, 2019
```
2、sqldebug
3、修改了机构列表、详情的页面
```
  4cf57147
29 Dec, 2018 1 commit
- 1、sql debug · 94c04a94
  gary authored Dec 29, 2018
```
2、admin入口校验是否有webadmin权限
```
  94c04a94