Merge branch 'master' of http://gitlib.occloud.net/biao/ZhiNanZhen

# Conflicts:
#	src/cn/compass/entity/CourseMst.inc

src/cn/compass/entity/CourseMst.inc

@@ -8,8 +8,6 @@
  */
 class CourseMst extends CompassDynamicData
 {
-	var $parent_category_id;
-	var $sub_category_id;
 	var $title;
 	var $front_image;
 	var $teacher_profile;
@@ -25,12 +23,19 @@ class CourseMst extends CompassDynamicData
 	{
 		parent::constructor($record);
 
+<<<<<<< HEAD
 		$this->parent_category_id = $record["parent_category_id"];
 		$this->sub_category_id    = $record["sub_category_id"];
 		$this->title              = $record["title"];
 		$this->front_image        = $record["front_image"];
 		$this->teacher_profile    = $record["teacher_profile"];
 		$this->delete_flg         = $record["delete_flg"];
+=======
+		$this->title           = $record["title"];
+		$this->front_image     = $record["front_image"];
+		$this->teacher_profile = $record["teacher_profile"];
+		$this->delete_flg      = $record["delete_flg"];
+>>>>>>> 78541f4f058325eb06d6076d532ac125befc77d0
 	}
 
 	/**
@@ -94,8 +99,6 @@ class CourseMst extends CompassDynamicData
 	{
 		$v_param = array();
 
-		ParamUtil::copyObj2Array($v_param, $this, "parent_category_id");
-		ParamUtil::copyObj2Array($v_param, $this, "sub_category_id");
 		ParamUtil::copyObj2Array($v_param, $this, "title");
 		ParamUtil::copyObj2Array($v_param, $this, "front_image");
 		ParamUtil::copyObj2ArrayNullField($v_param, $this, "teacher_profile");