Merge branch 'master' into docker_package
This commit is contained in:
commit
e1bf97ff70
|
@ -307,6 +307,8 @@
|
|||
tdr.undercarriage_reason,
|
||||
tdr.undercarriage_user_name,
|
||||
tdr.info_list,
|
||||
tdr.pin_top,
|
||||
tdr.pin_top_time,
|
||||
IFNULL( trs.score, 0 ) AS "score",
|
||||
IFNULL( taa.applyCount, 0 ) AS "applyCount",
|
||||
IFNULL( trc.collectCount, 0 ) AS "collectCount",
|
||||
|
@ -384,6 +386,8 @@
|
|||
tdr.undercarriage_user_name,
|
||||
tdr.info_list,
|
||||
tdr.total AS total,
|
||||
tdr.pin_top,
|
||||
tdr.pin_top_time,
|
||||
IFNULL(trs.score, 0 ) AS "score",
|
||||
IFNULL(taa.applyCount, 0 ) AS "applyCount",
|
||||
IFNULL(trc.collectCount, 0) AS "collectCount",
|
||||
|
|
Loading…
Reference in New Issue