合并冲突文件
commit
bcc7c0379d
|
@ -170,7 +170,7 @@ public class PatentWallService {
|
||||||
toolUtil.writeDebuggerLog(String.format("执行SQL: {%s} ---> 参数: {%s}", sqlStr, args));
|
toolUtil.writeDebuggerLog(String.format("执行SQL: {%s} ---> 参数: {%s}", sqlStr, args));
|
||||||
rs.executeQuery(sqlStr, args);
|
rs.executeQuery(sqlStr, args);
|
||||||
rs.next();
|
rs.next();
|
||||||
parsing = Util.null2String(rs.getString(1));
|
parsing = parsing.replaceFirst(pattern, Util.null2String(rs.getString(1)));;
|
||||||
}
|
}
|
||||||
// 清除参数信息
|
// 清除参数信息
|
||||||
args.clear();
|
args.clear();
|
||||||
|
|
Loading…
Reference in New Issue