Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
8c0a9af6a1
|
@ -455,7 +455,7 @@
|
|||
NVL( mr.CONSUME_PV, 0 ) consumePv,
|
||||
0 newConsumePv,
|
||||
|
||||
NVL( mr.TEAM_CONSUME_PV, 0 ) teamConsumePv,
|
||||
NVL( mr.TEAM_CONSUME_PV, 0 ) + NVL( mr.CONSUME_PV, 0 ) teamConsumePv,
|
||||
0 teamNewPv,
|
||||
|
||||
0 sNewConsumePv,
|
||||
|
|
Loading…
Reference in New Issue