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

# Conflicts:
#	src/settings/compass_include.inc

doc/DB/compass_db_schema.sql

@@ -425,6 +425,8 @@ DROP TABLE IF EXISTS course_mst;
 CREATE TABLE IF NOT EXISTS course_mst(
 	id bigint unsigned NOT NULL PRIMARY KEY auto_increment,
 	registration_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+	parent_category_id int8 NOT NULL,
+	sub_category_id int8 NOT NULL,
 	title varchar(128) NOT NULL,
 	front_image text NOT NULL,
 	teacher_profile text,
@@ -434,7 +436,6 @@ CREATE TABLE IF NOT EXISTS course_mst(
 Create INDEX course_mst_id_idx ON course_mst(id);
 Create INDEX course_mst_title_idx ON course_mst(title);
 
-
 ##----user_point_log create
 
 DROP TABLE IF EXISTS user_point_log;

src/settings/compass_include.inc

@@ -24,8 +24,6 @@ require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/ClassMst.inc");
 require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/EventDat.inc");
 require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/GovernmentMst.inc");
 require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/GradeMst.inc");
-require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/MiniplayTrafficClickDat.inc");
-require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/MiniplayTrafficClickLog.inc");
 require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/OrganizationMst.inc");
 require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/SchoolMst.inc");
 require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/SystemConstantDat.inc");
@@ -37,10 +35,12 @@ require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/UserMst.inc");
 require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/UserPointLog.inc");
 require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/UserSignDat.inc");
 require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/UserStaffRelationDat.inc");
-require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/CourseMst.inc");
-require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/CourseMediaDat.inc");
 require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/MediaTagDat.inc");
 require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/UserMediaDat.inc");
+require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/SystemConstDat.inc");
+require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/CourseCategoryDat.inc");
+require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/CourseMst.inc");
+require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/CourseMediaDat.inc");
 
 // definition
 require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/definition/ImageType.inc");
@@ -56,6 +56,7 @@ require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/definition/SystemFunction.in
 require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/definition/OrganizationStatus.inc");
 require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/definition/AcountModule.inc");
 require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/definition/OrderStatus.inc");
+require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/definition/CourseParentCategory.inc");
 
 // Action
 require_once(COMPASS_LIB_ROOT . "/cn/compass/action/TemplateAction.inc");