bug1,2改完

bug1,2改完