Commits · 99130e499ebe06b70983afabcfec0d9b884b8120 · wangxiaoming / traffic-front

21 Sep, 2018 11 commits
- [bug] fix org xml ID to id · 99130e49
  neo authored Sep 21, 2018
  
  99130e49
- conflict · a2da0e64
  HP authored Sep 21, 2018
  
  a2da0e64
- Merge branch 'dev_oracle' of · 12093ef8
  HP authored Sep 21, 2018
```
http://code.tech.tax.asia.pwcinternal.com/root/atms.git into dev_oracle

Conflicts:
	atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/OrganizationExtendsMapper.xml
```
  12093ef8
- adjust oracle sql · e4684c1c
  HP authored Sep 21, 2018
  
  e4684c1c
- [bugfix] fixed sql for isActive to is_active · f0ad0ce5
  neo authored Sep 21, 2018
  
  f0ad0ce5
- [dev] sql erro for mis spacke · 948afa30
  neo authored Sep 21, 2018
  
  948afa30
- [dev] change get project from count sql erro · a1cb888d
  neo authored Sep 21, 2018
  
  a1cb888d
- [dev] fixed some project query sql bug · 5d0c7966
  neo authored Sep 21, 2018
  
  5d0c7966
- [bug] get all project sql er · 4f452d87
  neo authored Sep 21, 2018
  
  4f452d87
- [bugfix] fixed org extend xml bugs · 2664d707
  neo authored Sep 21, 2018
  
  2664d707
- [dev] delete project for generate db · 0c75f483
  neo authored Sep 21, 2018
  
  0c75f483
20 Sep, 2018 8 commits
- [dev] fixed oracle user name · ead3f334
  neo authored Sep 20, 2018
  
  ead3f334
- [dev] used druid pool datasource · 5929e80f
  neo authored Sep 20, 2018
  
  5929e80f
- [dev] replace User with delemeter · 301477cd
  neo authored Sep 20, 2018
  
  301477cd
- [dev] repalce oracle xml some config · 4a104195
  neo authored Sep 20, 2018
  
  4a104195
- [dev] use URL for oracle datasource config · 9cb1b480
  neo authored Sep 20, 2018
  
  9cb1b480
- [dev] add oracle bean datasource · cfb6138e
  neo authored Sep 20, 2018
  
  cfb6138e
- [dev] add ojdbc from oracle · 7d88a8eb
  neo authored Sep 20, 2018
  
  7d88a8eb
- [dev] add oracle dev config · 62c08a55
  neo authored Sep 20, 2018
  
  62c08a55
19 Sep, 2018 6 commits
- [dev] revert user wrap with delimetor · 05876403
  neo authored Sep 19, 2018
  
  05876403
- [dev] use delimieter wrap keyword in user table · 7a7f3fcd
  neo authored Sep 19, 2018
  
  7a7f3fcd
- [dev] delelte mapper extend used annotation · debb3883
  neo authored Sep 19, 2018
  
  debb3883
- [dev] fix error xml import · c4d10197
  neo authored Sep 19, 2018
  
  c4d10197
- [dev] delete atms gen module · f292d70a
  neo authored Sep 19, 2018
  
  f292d70a
- [dev] delete gen module unsued jpa repository · 2e2fbfd8
  neo authored Sep 19, 2018
  
  2e2fbfd8
18 Sep, 2018 4 commits
- [dev] fix jdbctype to lower · 6f06c5e3
  neo authored Sep 18, 2018
  
  6f06c5e3
- [bugfix] fix cell template property errro · fdad3c15
  neo authored Sep 18, 2018
  
  fdad3c15
- [dev] delete stand acount and entertirce acount mapper xml in vat · 3eccb5cf
  neo authored Sep 18, 2018
  
  3eccb5cf
- [dev] delete some java samename project and admin db · f0dacd38
  neo authored Sep 18, 2018
  
  f0dacd38
17 Sep, 2018 6 commits
- [dev] fixed some filed type error · 4b21da27
  neo authored Sep 17, 2018
  
  4b21da27
- [dev] add vat some file · 158e0c4c
  neo authored Sep 17, 2018
  
  158e0c4c
- [dev] delete vat some filed · e99ddc02
  neo authored Sep 17, 2018
  
  e99ddc02
- [dev] change template group issystme to boolean · 5718f044
  neo authored Sep 17, 2018
  
  5718f044
- [dev] fixed column name in mapper annotaiton · a0e7c4b0
  neo authored Sep 17, 2018
  
  a0e7c4b0
- [dev] fix oracle xml · d6207295
  neo authored Sep 17, 2018
  
  d6207295
14 Sep, 2018 5 commits
- [bugfix] fixed some bugs · d16cb20f
  neo authored Sep 14, 2018
  
  d16cb20f
- [dev] re gernerator Template entity and xml · 60fc2bda
  neo authored Sep 14, 2018
  
  60fc2bda
- [dev] config for ignorecase fase and add some diffrence file · 7b14e66b
  neo authored Sep 14, 2018
  
  7b14e66b
- [dev] fixed some spell error · 9c1febad
  neo authored Sep 14, 2018
  
  9c1febad
- [dev] fixed for schema with entity and mapper and xml · 8c1b4822
  neo authored Sep 14, 2018
  
  8c1b4822