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

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

# Conflicts:
#	doc/DB/compass_db_schema.sql
#	src/cn/compass/entity/AccountMst.inc
#	src/cn/compass/entity/CourseMst.inc

doc/DB/compass_db_schema.sql

@@ -358,11 +358,17 @@ CREATE TABLE IF NOT EXISTS certificate_mst(
 	id bigint unsigned NOT NULL PRIMARY KEY auto_increment,
 	registration_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	title varchar(128) NOT NULL,
+<<<<<<< HEAD
 	front_image varchar(64) NOT NULL,
 	display_order bigint NOT NULL DEFAULT '1',
+=======
+	front_image text NOT NULL,
+	display_order int8 NOT NULL DEFAULT '1',
+>>>>>>> eb3e8ee3acfddebcb6320578b220a01256ab4ab3
 	delete_flg tinyint(1) NOT NULL DEFAULT '0'
 ) ENGINE = INNODB DEFAULT CHARSET=utf8mb4;
 
+Create INDEX certificate_mst_id_idx ON certificate_mst(id);
 
 
 ##----user_point_log create
@@ -414,6 +420,21 @@ CREATE TABLE IF NOT EXISTS media_tag_dat(
 Create INDEX media_tag_dat_tag_idx ON media_tag_dat(tag);
 
 
+##----course_category_dat create
+
+DROP TABLE IF EXISTS course_category_dat;
+CREATE TABLE IF NOT EXISTS course_category_dat(
+	id bigint unsigned NOT NULL PRIMARY KEY auto_increment,
+	registration_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+	parent_id int4 NOT NULL,
+	title varchar(128) NOT NULL,
+	delete_flg tinyint(1) NOT NULL DEFAULT '0'
+) ENGINE = INNODB DEFAULT CHARSET=utf8mb4;
+
+Create INDEX course_category_dat_id_idx ON course_category_dat(id);
+Create INDEX course_category_dat_parent_id_idx ON course_category_dat(parent_id);
+
+
 ##----course_mst create
 
 DROP TABLE IF EXISTS course_mst;
@@ -429,6 +450,7 @@ CREATE TABLE IF NOT EXISTS course_mst(
 ) ENGINE = INNODB DEFAULT CHARSET=utf8mb4;
 
 
+
 ##----user_point_log create
 
 DROP TABLE IF EXISTS user_point_log;

src/cn/compass/entity/AccountMst.inc

 <?php
 /**
  * AccountMst Entity
+<<<<<<< HEAD
  * $Id: AccountMst.inc,v 1.1 2020/2/13 10:54:23 Exp $
+=======
+ * $Id: AccountMst.inc,v 1.1 2020/2/13 11:17:48 Exp $
+>>>>>>> eb3e8ee3acfddebcb6320578b220a01256ab4ab3
  * @author lixq
  * @package jp.compass.entity
  * @access public

src/cn/compass/entity/CourseMst.inc

@@ -25,12 +25,25 @@ class CourseMst extends CompassDynamicData
 	{
 		parent::constructor($record);
 
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> eb3e8ee3acfddebcb6320578b220a01256ab4ab3
 		$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"];
+<<<<<<< HEAD
+=======
+=======
+		$this->title           = $record["title"];
+		$this->front_image     = $record["front_image"];
+		$this->teacher_profile = $record["teacher_profile"];
+		$this->delete_flg      = $record["delete_flg"];
+>>>>>>> 78541f4f058325eb06d6076d532ac125befc77d0
+>>>>>>> eb3e8ee3acfddebcb6320578b220a01256ab4ab3
 	}
 
 	/**