提交test
新增了新闻和活动的api
DROP TABLE IF EXISTS `sx_activity`;
CREATE TABLE `sx_activity` (
  `id` int(11) NOT NULL,
  `type` int(11) DEFAULT NULL,
  `title` varchar(300) DEFAULT NULL,
  `content` varchar(8000) DEFAULT NULL,
  `add_time` datetime DEFAULT NULL,
  `CREATE_BY` varchar(36) DEFAULT NULL COMMENT 'CREATE_BY',
  `CREATE_DATE` datetime DEFAULT NULL COMMENT 'CREATE_DATE',
  `UPDATE_BY` varchar(36) DEFAULT NULL COMMENT 'UPDATE_BY',
  `UPDATE_DATE` datetime DEFAULT NULL COMMENT 'UPDATE_DATE',
  `DELFLAG` int(11) DEFAULT NULL COMMENT 'DELFLAG',
  `DEL_DATE` datetime DEFAULT NULL COMMENT 'DEL_DATE',
  PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

-- ----------------------------
-- Table structure for sx_news
-- ----------------------------
DROP TABLE IF EXISTS `sx_news`;
CREATE TABLE `sx_news` (
  `id` int(11) NOT NULL,
  `title` varchar(300) DEFAULT NULL,
  `content` varchar(8000) DEFAULT NULL,
  `CREATE_BY` varchar(36) DEFAULT NULL COMMENT 'CREATE_BY',
  `CREATE_DATE` datetime DEFAULT NULL COMMENT 'CREATE_DATE',
  `UPDATE_BY` varchar(36) DEFAULT NULL COMMENT 'UPDATE_BY',
  `UPDATE_DATE` datetime DEFAULT NULL COMMENT 'UPDATE_DATE',
  `DELFLAG` int(11) DEFAULT NULL COMMENT 'DELFLAG',
  `DEL_DATE` datetime DEFAULT NULL COMMENT 'DEL_DATE',
  PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
tijiao
提交
Merge branch 'master' of https://github.com/zxsr20/haishiwang

Conflicts:
	jeecg-mybatis-framework/src/com/code/CodeUtil.java
	jeecg-mybatis-framework/src/scott/controller/shanxue/SxCourseController.java