gxb合并 #2

Open
pzbkveoly wants to merge 2 commits from gxb_branch into develop