Commit af81e985 authored by huyuchen's avatar huyuchen

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

parents c5710773 48b9c2a9
...@@ -89,5 +89,12 @@ ...@@ -89,5 +89,12 @@
<artifactId>commons-logging-icbc</artifactId> <artifactId>commons-logging-icbc</artifactId>
<version>1.2.0</version> <version>1.2.0</version>
</dependency> </dependency>
<!-- 交行jar引入 -->
<dependency>
<groupId>com.ipct.safety</groupId>
<artifactId>ipct_safety</artifactId>
<version>2.1.0</version>
</dependency>
</dependencies> </dependencies>
</project> </project>
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
LEFT JOIN LEFT JOIN
(SELECT (SELECT
SOCIAL_ID, SOCIAL_ID,
GROUP_CONCAT(DISTINCT AUDIT_REMARK) as 'reasons', GROUP_CONCAT(DISTINCT AUDIT_REMARK SEPARATOR '#') as 'reasons',
DISPATCH_INFO_ID DISPATCH_INFO_ID
FROM FROM
t_audit_info t_audit_info
...@@ -261,7 +261,7 @@ ...@@ -261,7 +261,7 @@
LEFT JOIN LEFT JOIN
(SELECT (SELECT
PROVIDENT_ID, PROVIDENT_ID,
GROUP_CONCAT(DISTINCT AUDIT_REMARK) as 'reasons', GROUP_CONCAT(DISTINCT AUDIT_REMARK SEPARATOR '#') as 'reasons',
DISPATCH_INFO_ID DISPATCH_INFO_ID
FROM FROM
t_audit_info t_audit_info
......
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