Merge "[Bugfix][342]modify git apply to patch"