diff --git a/tamguo-modules-core/pom.xml b/tamguo-modules-core/pom.xml
index e3427ba..ff86258 100644
--- a/tamguo-modules-core/pom.xml
+++ b/tamguo-modules-core/pom.xml
@@ -36,6 +36,11 @@
 			<artifactId>tamguo-common</artifactId>
 			<version>1.0.0</version>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.7</version>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/dao/SubjectMapper.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/dao/SubjectMapper.java
new file mode 100644
index 0000000..91742b6
--- /dev/null
+++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/dao/SubjectMapper.java
@@ -0,0 +1,8 @@
+package com.tamguo.modules.tiku.dao;
+
+import com.tamguo.config.dao.SuperMapper;
+import com.tamguo.modules.tiku.model.SubjectEntity;
+
+public interface SubjectMapper extends SuperMapper<SubjectEntity>{
+
+}
diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/SubjectEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/SubjectEntity.java
new file mode 100644
index 0000000..29bb9b7
--- /dev/null
+++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/SubjectEntity.java
@@ -0,0 +1,63 @@
+package com.tamguo.modules.tiku.model;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+
+@TableName(value="tiku_subject")
+public class SubjectEntity {
+	
+	@TableId
+	private String uid;
+	private String name;
+	private String sort;
+	
+	private String createBy;
+	private String updateBy;
+	private Date createDate;
+	private Date updateDate;
+	public String getUid() {
+		return uid;
+	}
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public String getSort() {
+		return sort;
+	}
+	public void setSort(String sort) {
+		this.sort = sort;
+	}
+	public String getCreateBy() {
+		return createBy;
+	}
+	public void setCreateBy(String createBy) {
+		this.createBy = createBy;
+	}
+	public String getUpdateBy() {
+		return updateBy;
+	}
+	public void setUpdateBy(String updateBy) {
+		this.updateBy = updateBy;
+	}
+	public Date getCreateDate() {
+		return createDate;
+	}
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+	public Date getUpdateDate() {
+		return updateDate;
+	}
+	public void setUpdateDate(Date updateDate) {
+		this.updateDate = updateDate;
+	}
+	
+}
diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/condition/SubjectCondition.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/condition/SubjectCondition.java
new file mode 100644
index 0000000..62de50a
--- /dev/null
+++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/condition/SubjectCondition.java
@@ -0,0 +1,21 @@
+package com.tamguo.modules.tiku.model.condition;
+
+public class SubjectCondition {
+	
+	private Integer pageNo;
+	private Integer pageSize;
+	
+	public Integer getPageSize() {
+		return pageSize;
+	}
+	public void setPageSize(Integer pageSize) {
+		this.pageSize = pageSize;
+	}
+	public Integer getPageNo() {
+		return pageNo;
+	}
+	public void setPageNo(Integer pageNo) {
+		this.pageNo = pageNo;
+	}
+	
+}
diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/ISubjectService.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/ISubjectService.java
new file mode 100644
index 0000000..fdbd41e
--- /dev/null
+++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/ISubjectService.java
@@ -0,0 +1,12 @@
+package com.tamguo.modules.tiku.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.service.IService;
+import com.tamguo.modules.tiku.model.SubjectEntity;
+import com.tamguo.modules.tiku.model.condition.SubjectCondition;
+
+public interface ISubjectService extends IService<SubjectEntity>{
+
+	Page<SubjectEntity> listData(SubjectCondition condition);
+
+}
diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/SubjectService.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/SubjectService.java
new file mode 100644
index 0000000..7f22d98
--- /dev/null
+++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/SubjectService.java
@@ -0,0 +1,26 @@
+package com.tamguo.modules.tiku.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.mapper.Condition;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.tamguo.modules.tiku.dao.SubjectMapper;
+import com.tamguo.modules.tiku.model.SubjectEntity;
+import com.tamguo.modules.tiku.model.condition.SubjectCondition;
+import com.tamguo.modules.tiku.service.ISubjectService;
+
+@Service
+public class SubjectService extends ServiceImpl<SubjectMapper, SubjectEntity> implements ISubjectService{
+	@Autowired
+	private SubjectMapper subjectMapper;
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Page<SubjectEntity> listData(SubjectCondition condition) {
+		Page<SubjectEntity> page = new Page<>(condition.getPageNo(), condition.getPageSize());
+		return page.setRecords(subjectMapper.selectPage(page, Condition.EMPTY));
+	}
+
+}
diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/tiku/web/SubjectController.java b/tamguo-oms/src/main/java/com/tamguo/modules/tiku/web/SubjectController.java
new file mode 100644
index 0000000..f6396b4
--- /dev/null
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/tiku/web/SubjectController.java
@@ -0,0 +1,41 @@
+package com.tamguo.modules.tiku.web;
+
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.AutoConfigureOrder;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.tamguo.common.utils.Result;
+import com.tamguo.modules.tiku.model.SubjectEntity;
+import com.tamguo.modules.tiku.model.condition.SubjectCondition;
+import com.tamguo.modules.tiku.service.ISubjectService;
+
+@Controller
+@RequestMapping(path="tk/subject")
+public class SubjectController {
+
+	/** 题库分类*/
+	private final String SUBJECT_INDEX_PAGE = "modules/tiku/subject/index";
+	
+	@Autowired
+	private ISubjectService iSubjectService;
+
+	@RequestMapping(path="list")
+	public ModelAndView list(ModelAndView model) {
+		model.setViewName(SUBJECT_INDEX_PAGE);
+		return model;
+	}
+	
+	@RequestMapping(path="listData",method=RequestMethod.POST)
+	@ResponseBody
+	public Map<String, Object> listData(SubjectCondition condition) {
+		Page<SubjectEntity> page = iSubjectService.listData(condition);
+		return Result.jqGridResult(page.getRecords(), page.getTotal(), page.getSize(), page.getCurrent(), page.getPages());
+	}
+}
diff --git a/tamguo-oms/src/main/resources/templates/modules/tiku/subject/index.html b/tamguo-oms/src/main/resources/templates/modules/tiku/subject/index.html
new file mode 100644
index 0000000..ed62aaf
--- /dev/null
+++ b/tamguo-oms/src/main/resources/templates/modules/tiku/subject/index.html
@@ -0,0 +1,130 @@
+<!DOCTYPE html><html><head><meta charset="utf-8"><meta content="webkit" name="renderer"/><meta http-equiv="X-UA-Compatible"
+content="IE=edge"><meta name="keywords" content="PoweredByJeeSiteV4.0"/><meta http-equiv="Cache-Control"
+content="no-cache, no-store, must-revalidate"/><meta name="description" content="PoweredByJeeSiteV4.0"/><meta
+content="no-cache" http-equiv="Pragma"/><meta http-equiv="Expires" content="0"/><meta
+content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
+<title>题库类型 - JeeSite Demo</title>
+<script th:src="${setting.domain + 'global.min.js'}"></script>
+<script th:src="${setting.domain + 'jquery/jquery-1.12.4.min.js'}"></script>
+<script th:src="${setting.domain + 'jquery/jquery-migrate-1.4.1.min.js'}"></script>
+<!--[if lt IE 9]><script src="/js/static/common/h5fix.min.js"></script><![endif]-->
+<link rel="stylesheet" th:href="${setting.domain + 'fonts/font-icons.min.css'}">
+<link rel="stylesheet" th:href="${setting.domain + 'bootstrap/css/bootstrap.min.css'}">
+<link rel="stylesheet" th:href="${setting.domain + 'select2/4.0/select2.css'}">
+<link rel="stylesheet" th:href="${setting.domain + 'icheck/1.0/minimal/grey.css'}">
+<link rel="stylesheet" th:href="${setting.domain + 'jqGrid/4.7/css/ui.jqgrid.css'}">
+<link rel="stylesheet" th:href="${setting.domain + 'adminlte/css/AdminLTE.min.css'}">
+<link rel="stylesheet" th:href="${setting.domain + 'common/jeesite.css'}">
+<link rel="stylesheet" th:href="${setting.domain + 'common/common.css'}">
+</head><body class="hold-transition ">
+<div class="wrapper"><div class="main-content">
+	<div class="box box-main">
+		<div class="box-header">
+			<div class="box-title">
+				<i class="fa icon-trophy"></i> 题库分类
+			</div>
+			<div class="box-tools pull-right">
+				<a href="#" class="btn btn-default" id="btnSearch" title="查询"><i class="fa fa-filter"></i> 查询</a>
+					<a th:href="${setting.domain + 'tiku/subject/add'}" class="btn btn-default btnTool" title="新增分类"><i class="fa fa-plus"></i> 新增</a>
+			</div>
+		</div>
+		<div class="box-body">
+<form id="searchForm" th:action="${setting.domain + 'tk/subject/listData'}" method="post" class="form-inline hide" data-page-no="1" data-page-size="20" data-order-by="">
+				<div class="form-group">
+					<label class="control-label">岗位编码：</label>
+					<div class="control-inline">
+<input type="text" id="code" name="code" value="" maxlength="64" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">岗位名称：</label>
+					<div class="control-inline">
+<input type="text" id="name" name="name" value="" maxlength="100" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">岗位分类：</label>
+					<div class="control-inline width-90">
+						<select id="postType" name="postType" class="form-control">
+							<option value="">&nbsp;</option>
+							<option value="gaoguan">高管</option>
+							<option value="zhongceng">中层</option>
+							<option value="jiceng">基层</option>
+							<option value="qita">其它</option>
+						</select>					
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">状态：</label>
+					<div class="control-inline width-60">
+						<select id="status" name="status" class="form-control">
+							<option value="">&nbsp;</option>
+							<option value="normal">正常</option>
+							<option value="disabled">停用</option>
+						</select>					
+					</div>
+				</div>
+				<div class="form-group">
+					<button type="submit" class="btn btn-primary btn-sm">查询</button>
+					<button type="reset" class="btn btn-default btn-sm">重置</button>
+				</div>
+</form>
+			<table id="dataGrid"></table>
+			<div id="dataGridPage"></div>
+		</div>
+	</div>
+</div>
+</div>
+
+<a id="scroll-up" href="#" class="btn btn-sm"><i class="fa fa-angle-double-up"></i></a>
+<script th:src="${setting.domain + 'bootstrap/js/bootstrap.min.js'}"></script>
+<script th:src="${setting.domain + 'select2/4.0/select2.js'}"></script>
+<script th:src="${setting.domain + 'select2/4.0/i18n/zh_CN.js'}"></script>
+<script th:src="${setting.domain + 'layer/3.1/layer.js'}"></script>
+<script th:src="${setting.domain + 'my97/WdatePicker.js'}"></script>
+<script th:src="${setting.domain + 'jqGrid/4.7/js/jquery.jqGrid.js'}"></script>
+<script th:src="${setting.domain + 'jqGrid/4.7/js/jquery.jqGrid.extend.js'}"></script>
+<script th:src="${setting.domain + 'jqGrid/4.7/js/i18n/zh_CN.js'}"></script>
+<script th:src="${setting.domain + 'common/jeesite.js'}"></script>
+<script th:src="${setting.domain + 'common/i18n/jeesite_zh_CN.js'}"></script>
+<script th:src="${setting.domain + 'common/common.js'}"></script>
+<script type="text/javascript">
+// 初始化DataGrid对象
+$('#dataGrid').dataGrid({
+	searchForm: $("#searchForm"),
+	columnModel: [
+		{header:'岗位名称', name:'name', index:'a.post_name', width:200, align:"center", frozen:true, formatter: function(val, obj, row, act){
+			return '<a href="'+ctx+'tk/post/detail?id='+row.id+'" class="btnList" data-title="编辑岗位">'+(val||row.id)+'</a>';
+		}},
+		{header:'岗位编码', name:'id', index:'a.post_code', width:200, align:"center"},
+		{header:'排序号', name:'sort', index:'a.post_sort', width:80, align:"center"},
+		{header:'更新时间', name:'updateDate', index:'a.update_date', width:150, align:"center"},
+		{header:'备注信息', name:'remarks', index:'a.remarks', width:200, align:"left"},
+		{header:'状态', name:'status', index:'a.status', width:80, align:"center", formatter: function(val, obj, row, act){
+			if(val == "normal"){
+				return '正常';
+			}else if(val == "disable"){
+				return '停用';
+			}else{
+				return '未知';
+			}
+		}},
+		{header:'操作', name:'actions', width:130, sortable:false, title:false, formatter: function(val, obj, row, act){
+			var actions = [];
+				actions.push('<a href="'+ctx+'sys/post/update?id='+row.postCode+'" class="btnList" title="编辑岗位"><i class="fa fa-pencil"></i></a>&nbsp;');
+				if (row.status == "normal"){
+					actions.push('<a href="'+ctx+'sys/post/detail?id='+row.id+'" class="btnList" title="停用岗位" data-confirm="确认要停用该岗位吗？"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
+				}
+				if (row.status == "disabled"){
+					actions.push('<a href="/js/a/sys/post/enable?postCode='+row.id+'" class="btnList" title="启用岗位" data-confirm="确认要启用该岗位吗？"><i class="glyphicon glyphicon-ok-circle"></i></a>&nbsp;');
+				}
+				actions.push('<a href="/js/a/sys/post/delete?postCode='+row.id+'" class="btnList" title="删除岗位" data-confirm="确认要删除该岗位吗？"><i class="fa fa-trash-o"></i></a>&nbsp;');
+			return actions.join('');
+		}}
+	],
+	// 加载成功后执行事件
+	ajaxSuccess: function(data){
+		
+	}
+});
+</script>
\ No newline at end of file