update admin - query data in a week
Merge branch 'ljc_whx_dev' into dev