Commit 86393199 authored by TIANZHI.HU's avatar TIANZHI.HU

Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/main/webapp/WEB-INF/classes/hls/HLS536/hls_journal_import_header_wfl.lwm
parents 6df2e7db a09dd5f4
......@@ -46,7 +46,7 @@
t1.journal_type,
(select t.post_gl_status
from hls_journal_header t
where t.journal_num = t1.journal_num) post_gl_status
where t.journal_header_imp_id = t1.journal_header_id) post_gl_status
FROM hls_journal_header_imp t1
#WHERE_CLAUSE#
order by t1.journal_header_id desc
......
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