Commits · 58b9b3466f6403abd918ae81cd44a1e1807e6b47 · wangxiaoming / traffic-front

25 Oct, 2018 9 commits
- Merge branch 'dev_oracle_neo' into 'dev_oracle' · 58b9b346
  neo.wang authored Oct 25, 2018
```
Dev oracle neo

See merge request root/atms!154
```
  58b9b346
- Merge branch 'dev_oracle' of code.tech.tax.asia.pwcinternal.com:root/atms into neo_jpa_withoutgen · 8c31c17d
  neo authored Oct 25, 2018
  
  8c31c17d
- Merge branch 'dev_oracle_neo' into 'dev_oracle' · 39746550
  neo.wang authored Oct 25, 2018
```
Dev oracle neo

See merge request root/atms!153
```
  39746550
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · 4d60f347
  sherlock authored Oct 25, 2018
```
bug:a19214

See merge request root/atms!152
```
  4d60f347
- Merge branch 'dev_oracle' of code.tech.tax.asia.pwcinternal.com:root/atms into neo_jpa_withoutgen · 9979beab
  neo authored Oct 25, 2018
  
  9979beab
- bug:app-overview:listView\cardView · 3389f798
  sherlock authored Oct 25, 2018
  
  3389f798
- Revert "[dev] delete unused unit test and test used sql" · 060fafe6
  neo authored Oct 25, 2018
```
This reverts commit 0ea4ca84.
```
  060fafe6
- [dev] delete unused js in approval ctrl js · 6c96d113
  neo authored Oct 25, 2018
  
  6c96d113
- [dev] add tree and blanc page for approval · 20b6f4e0
  neo authored Oct 25, 2018
  
  20b6f4e0
24 Oct, 2018 28 commits
- [dev] add menu for list appoval and delete module-parts js in app · 841c9a3e
  neo authored Oct 24, 2018
```
foulder
```
  841c9a3e
- Merge branch 'dev_oracle_neo' into 'dev_oracle' · 13023bd2
  neo.wang authored Oct 24, 2018
```
Dev oracle neo

See merge request root/atms!151
```
  13023bd2
- [dev] add create by when create approval · e47b1005
  neo authored Oct 24, 2018
  
  e47b1005
- [DEV] add create and approvate by and time · 35a015f4
  neo authored Oct 24, 2018
  
  35a015f4
- [bugfix] fixed task is to next station create attache not found task · 4a02f5b5
  neo authored Oct 24, 2018
  
  4a02f5b5
- [bugfix] cannot use instance and assign with same transcition · ec03f7af
  neo authored Oct 24, 2018
  
  ec03f7af
- merge and delete dist files · 5f275d23
  eddie.woo authored Oct 24, 2018
  
  5f275d23
- fix config · 8f1654d7
  eddie.woo authored Oct 24, 2018
  
  8f1654d7
- [bugfix] not set projectid when insert approval · ae7d669e
  neo authored Oct 24, 2018
  
  ae7d669e
- [bugfix] fixed compile error for apporval · 33775a6b
  neo authored Oct 24, 2018
  
  33775a6b
- [dev] split startInstanceAndAssigne to two transextion · 96d1778b
  neo authored Oct 24, 2018
  
  96d1778b
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · 52c9a275
  sherlock authored Oct 24, 2018
```
bug:app-overview:listView\cardView

See merge request root/atms!150
```
  52c9a275
- bug:app-overview:listView\cardView · a153d615
  sherlock authored Oct 24, 2018
  
  a153d615
- Merge branch 'dev_oracle' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_oracle · ea628b23
  eddie.woo authored Oct 24, 2018
  
  ea628b23
- 添加用户 · 81aa7a06
  eddie.woo authored Oct 24, 2018
  
  81aa7a06
- [bugfix] fixed url for task attachment · 2287fb7f
  neo authored Oct 24, 2018
  
  2287fb7f
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · 41eba5c1
  sherlock authored Oct 24, 2018
```
bug:19196\19195\19214\19215\192161\19217\19220

See merge request root/atms!149
```
  41eba5c1
- bug:19196\19195\19214\19215\192161\19217\19220 · 4af55d75
  sherlock authored Oct 24, 2018
  
  4af55d75
- [dev] add exception printstatck · 2f51730a
  neo authored Oct 24, 2018
  
  2f51730a
- Merge branch 'dev_oracle' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_oracle · 76ffda90
  eddie.woo authored Oct 24, 2018
  
  76ffda90
- staging配置 · b582ad6b
  eddie.woo authored Oct 24, 2018
  
  b582ad6b
- 模板上传下载 · 85ef16e1
  eddie.woo authored Oct 24, 2018
  
  85ef16e1
- [bugifx] fixed approval split periodDate · b31299b6
  neo authored Oct 24, 2018
  
  b31299b6
- [buffix] fixed report view sheet at 0 getTag · ce2d5c2a
  neo authored Oct 24, 2018
  
  ce2d5c2a
- [bugfix] fix bb foumula set parsedFormual · 2e10d975
  neo authored Oct 24, 2018
  
  2e10d975
- [bugfix] fixed bb foumula update periodcelltemplateconfig · c81e0a77
  neo authored Oct 24, 2018
  
  c81e0a77
- [dev] add service annotation for ApprovalService · 17360b77
  neo authored Oct 24, 2018
  
  17360b77
- [dev] add transactional fro approval · 30c17c8f
  neo authored Oct 24, 2018
  
  30c17c8f
23 Oct, 2018 3 commits
- Merge branch 'dev_oracle_neo' into 'dev_oracle' · 192f049b
  neo.wang authored Oct 23, 2018
```
[bugfix] fixed bad param exception with no construct

See merge request root/atms!148
```
  192f049b
- [bugfix] fixed bad param exception with no construct · e706d631
  neo authored Oct 23, 2018
  
  e706d631
- Merge branch 'dev_oracle_neo' into 'dev_oracle' · 62616331
  neo.wang authored Oct 23, 2018
```
[dev] approval with db logic impl

See merge request root/atms!147
```
  62616331