Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

@@ -182,7 +182,7 @@ class UserData
 	 * @param int $suggest_type 意见类型
 	 * @param int $suggest_type 意见类型
 	 * @return array 意见反馈接口返回的数据
 	 * @return array 意见反馈接口返回的数据
 	 */
 	 */
-	public static function suggestData($uid, $content, $suggest_type, $limit = 30)
+	public static function savesuggestData($uid, $content, $suggest_type, $limit = 30)
 	{
 	{
 		$param = Yohobuy::param();
 		$param = Yohobuy::param();
 		$param['uid'] = $uid;
 		$param['uid'] = $uid;

@@ -204,7 +204,7 @@ class UserModel
 		$result = array();
 		$result = array();
 
 
 		// 调用接口保存意见反馈数据
 		// 调用接口保存意见反馈数据
-		return UserData::suggestData($uid, $content, $suggest_type);
+		return UserData::savesuggestData($uid, $content, $suggest_type);
 	}
 	}
 
 
 }
 }