Merge branch '2020.07.12-660' of http://demo.ibizlab.cn/ibizr7pfstdtempl/ibizvuer7res into 2020.07.12-660