Commit c0b9adac authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16

parents ffbad9ad 0e1dc97d
...@@ -197,6 +197,7 @@ ...@@ -197,6 +197,7 @@
WHERE WHERE
CREATE_TIME > DATE_SUB(CURDATE(), INTERVAL 4 MONTH) CREATE_TIME > DATE_SUB(CURDATE(), INTERVAL 4 MONTH)
) AS si ON di.SOCIAL_ID = si.ID ) AS si ON di.SOCIAL_ID = si.ID
LEFT JOIN
(SELECT (SELECT
SOCIAL_ID, SOCIAL_ID,
GROUP_CONCAT(DISTINCT AUDIT_REMARK) as 'reasons', GROUP_CONCAT(DISTINCT AUDIT_REMARK) as 'reasons',
...@@ -257,6 +258,7 @@ ...@@ -257,6 +258,7 @@
WHERE WHERE
CREATE_TIME > DATE_SUB(CURDATE(), INTERVAL 4 MONTH ) CREATE_TIME > DATE_SUB(CURDATE(), INTERVAL 4 MONTH )
) AS pf ON di.FUND_ID = pf.ID ) AS pf ON di.FUND_ID = pf.ID
LEFT JOIN
(SELECT (SELECT
PROVIDENT_ID, PROVIDENT_ID,
GROUP_CONCAT(DISTINCT AUDIT_REMARK) as 'reasons', GROUP_CONCAT(DISTINCT AUDIT_REMARK) as 'reasons',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment