合并冲突文件

com/api/aiyh_pcn/patentWall/service/PatentWallService.java

@@ -170,7 +170,7 @@ public class PatentWallService {
 					toolUtil.writeDebuggerLog(String.format("执行SQL： {%s} ---> 参数： {%s}", sqlStr, args));
 					rs.executeQuery(sqlStr, args);
 					rs.next();
-					parsing = Util.null2String(rs.getString(1));
+					parsing = parsing.replaceFirst(pattern, Util.null2String(rs.getString(1)));;
 				}
 //				清除参数信息
 				args.clear();