Signed-off-by: Chaozhang Xue <475990465@qq.com>
Signed-off-by: Lujie Zhou <lujie.zhou@jago-ag.cn>
Signed-off-by: wucangzhou <wucangzhou@gmail.com>
Merge branch 'master' into cangZhou
Merge branch 'master' into jingye

Conflicts:
	protected/backend/runtime/application.log

Signed-off-by: Jingye Wang <4893278@qq.com>