Commits · b1773d277a310542a091c01a068d456f93184b28 · wangxiaoming / traffic-front

26 Sep, 2018 5 commits
- [dev] fixed set Project Status wiht project id · b1773d27
  neo authored Sep 26, 2018
  
  b1773d27
- [dev] re regernate mapper xml java use oracle table · 492b59e6
  neo authored Sep 26, 2018
  
  492b59e6
- Merge branch 'dev_oracle_neo' into 'dev_oracle' · d44179d7
  neo.wang authored Sep 26, 2018
```
Dev oracle neo

See merge request root/atms!112
```
  d44179d7
- fixed db sql error · 707efc83
  frank.xa.zhang authored Sep 26, 2018
  
  707efc83
- Merge remote-tracking branch 'remotes/origin/dev_oracle' into dev_oracle_frank · a7e0ea48
  frank.xa.zhang authored Sep 26, 2018
  
  a7e0ea48
25 Sep, 2018 11 commits
- fixed db error · 83b4bdf3
  frank.xa.zhang authored Sep 25, 2018
  
  83b4bdf3
- [dev] delete getProjectStauts by dbName Dbname parameter · cf917498
  neo authored Sep 25, 2018
  
  cf917498
- [bugfix] use id instead of project id getProejctStatus · 2631856f
  neo authored Sep 25, 2018
  
  2631856f
- [dev] get all project status use project id not use db name · 145f7ae4
  neo authored Sep 25, 2018
  
  145f7ae4
- [dev] delete opertion log in project add · 647110ba
  neo authored Sep 25, 2018
  
  647110ba
- Revert "[dev] add operation extends mapper xml" · 4dcdbb73
  neo authored Sep 25, 2018
```
This reverts commit 07a9c1df.
```
  4dcdbb73
- [dev] add operation extends mapper xml · 07a9c1df
  neo authored Sep 25, 2018
  
  07a9c1df
- [dev] revert js html for id to ID · 54958fdd
  neo authored Sep 25, 2018
  
  54958fdd
- [dev] user jsonProperty annotaion for all id · bc4f9054
  neo authored Sep 25, 2018
  
  bc4f9054
- [dev]fixed mapp xml property ID to id · a351f6e5
  neo authored Sep 25, 2018
  
  a351f6e5
- [dev] fixed map sql to uppercase · e208c603
  neo authored Sep 25, 2018
  
  e208c603
21 Sep, 2018 12 commits
- [bugfix] fix id setter and getter · fe66644f
  neo authored Sep 21, 2018
  
  fe66644f
- [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 4 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