diff --git a/src/main/java/com/pro/info/controller/ColorController.java b/src/main/java/com/pro/info/controller/ColorController.java
new file mode 100644
index 0000000000000000000000000000000000000000..ff56b3a82bf1f72cdfa0035aaa7539c69b775447
--- /dev/null
+++ b/src/main/java/com/pro/info/controller/ColorController.java
@@ -0,0 +1,46 @@
+package com.pro.info.controller;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.pro.info.entity.Color;
+import com.pro.info.service.ColorService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("/info")
+public class ColorController {
+    @Autowired
+    private ColorService colorService;
+
+    @RequestMapping("a")
+    public String aaa(){
+        return "info/color";
+    }
+
+    @RequestMapping(value = "colors")
+    @ResponseBody
+    public Map<String, Object> getColor(@RequestParam(value = "page",defaultValue = "1") Integer page,@RequestParam(value = "limit") Integer limit){
+
+        PageHelper.startPage(page,limit);
+        System.out.println(page+"-------"+limit);
+        List<Color> colors = colorService.getColor();
+        System.out.println(colors.size());
+        Map<String,Object> map = new HashMap<String, Object>();
+        PageInfo<Color> pageInfo = new PageInfo<Color>(colors);
+        map.put("code",0);
+        map.put("data",colors);
+        map.put("count",colors.size());
+        map.put("msg","");
+        return map;
+    }
+
+
+}
diff --git a/src/main/java/com/pro/info/controller/controller.java b/src/main/java/com/pro/info/controller/controller.java
deleted file mode 100644
index 99057253f8c54e27affa1db8ed309cdce6cbde3d..0000000000000000000000000000000000000000
--- a/src/main/java/com/pro/info/controller/controller.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.pro.info.controller;
-
-public class controller {
-}
diff --git a/src/main/java/com/pro/info/mapper/ColorMapper.java b/src/main/java/com/pro/info/mapper/ColorMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..751a699c372bea9a03ce1a8ae1cb79f8585cd849
--- /dev/null
+++ b/src/main/java/com/pro/info/mapper/ColorMapper.java
@@ -0,0 +1,12 @@
+package com.pro.info.mapper;
+
+import com.pro.info.entity.Color;
+import org.mybatis.spring.annotation.MapperScan;
+
+import java.util.List;
+import java.util.Map;
+
+@MapperScan
+public interface ColorMapper {
+    List<Color> getColor();
+}
diff --git a/src/main/java/com/pro/info/mapper/mapper.java b/src/main/java/com/pro/info/mapper/mapper.java
deleted file mode 100644
index b54623a237065f01e32db229cfa3f844696a41f6..0000000000000000000000000000000000000000
--- a/src/main/java/com/pro/info/mapper/mapper.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.pro.info.mapper;
-
-public class mapper {
-}
diff --git a/src/main/java/com/pro/info/service/ColorService.java b/src/main/java/com/pro/info/service/ColorService.java
new file mode 100644
index 0000000000000000000000000000000000000000..3f37af581de6e1aa06def869f5c2b0fe8b2f1597
--- /dev/null
+++ b/src/main/java/com/pro/info/service/ColorService.java
@@ -0,0 +1,11 @@
+package com.pro.info.service;
+
+import com.pro.info.entity.Color;
+
+import java.util.List;
+
+public interface ColorService {
+    List<Color> getColor();
+//public PageInfo<Color> getColor(int page, int pageSize);
+
+}
diff --git a/src/main/java/com/pro/info/service/impl/ColorServiceImpl.java b/src/main/java/com/pro/info/service/impl/ColorServiceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..f7c12ca4cff97890013aa1a82c12522a15ed07fc
--- /dev/null
+++ b/src/main/java/com/pro/info/service/impl/ColorServiceImpl.java
@@ -0,0 +1,29 @@
+package com.pro.info.service.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.pro.info.entity.Color;
+import com.pro.info.mapper.ColorMapper;
+import com.pro.info.service.ColorService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class ColorServiceImpl implements ColorService {
+    @Autowired
+    private ColorMapper colorMapper;
+
+
+
+//    @Override
+//    public PageInfo<Color> getColor(int page, int pageSize) {
+//        PageHelper.startPage(page, pageSize);
+//        List<Color> list = colorMapper.getColor();
+//        return new PageInfo<Color>(list);
+//    }
+    @Override
+    public List<Color> getColor() {
+        return colorMapper.getColor();
+    }
+}
diff --git a/src/main/java/com/pro/info/service/impl/serviceimpl.java b/src/main/java/com/pro/info/service/impl/serviceimpl.java
deleted file mode 100644
index 8b00d99451fd5ab02e7cf7e27a3a0b17c4017df7..0000000000000000000000000000000000000000
--- a/src/main/java/com/pro/info/service/impl/serviceimpl.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.pro.info.service.impl;
-
-public class serviceimpl {
-}
diff --git a/src/main/java/com/pro/info/service/service.java b/src/main/java/com/pro/info/service/service.java
deleted file mode 100644
index efab91ec8278345686f866a1a2f17143de9f468a..0000000000000000000000000000000000000000
--- a/src/main/java/com/pro/info/service/service.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.pro.info.service;
-
-public class service {
-}
diff --git a/src/main/resources/mapper/info/mapper.xml b/src/main/resources/mapper/info/ColorMapper.xml
similarity index 48%
rename from src/main/resources/mapper/info/mapper.xml
rename to src/main/resources/mapper/info/ColorMapper.xml
index 926124daabb8ed369314dd8ecdb13ce5f3a5d7f2..3d8234d5740e9fb3a581ac5c4d87a4a92a24d15f 100644
--- a/src/main/resources/mapper/info/mapper.xml
+++ b/src/main/resources/mapper/info/ColorMapper.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.pro.info.mapper.mapper">
+<mapper namespace="com.pro.info.mapper.ColorMapper">
+    <select id="getColor" resultType="com.pro.info.entity.Color">
+        select * from info_color
+    </select>
 
 
 </mapper>
\ No newline at end of file
diff --git a/src/main/web/WEB-INF/views/info/color.jsp b/src/main/web/WEB-INF/views/info/color.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..13914f40340ecc600144171c9ae09f33280e7ff3
--- /dev/null
+++ b/src/main/web/WEB-INF/views/info/color.jsp
@@ -0,0 +1,86 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: lenovo
+  Date: 2018/8/2
+  Time: 15:40
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>Title</title>
+    <link rel="stylesheet" href="../../../static/layui-2.3.0/css/layui.css" media="all">
+</head>
+<body>
+<div class="layui-btn-container">
+    <button type="button" class="layui-btn" id="bn-col-add"><i class="layui-icon">&#xe608;</i> 新增</button>
+    <button type="button" class="layui-btn" id="bn-col-cfm"><i class="layui-icon layui-icon-ok-circle"></i> 确定</button>
+    <button type="button" class="layui-btn" id="bn-col-use"><i class="layui-icon layui-icon-auz"></i> 启用</button>
+    <button type="button" class="layui-btn" id="bn-col-unuse"><i class="layui-icon layui-icon-fonts-del"></i> 禁用</button>
+    <button class="layui-btn layui-btn-danger" id="bn-col-del-multi"><i class="layui-icon layui-icon-delete"></i> 删除</button>
+</div>
+
+<!-- 状态 00-未确定 22-确定 55-启用 77-禁用 99-逻辑删除 -->
+<!-- 数据表格。  lay-filter的值可以理解为layui内部使用的唯一标志-->
+<table id="color-table" lay-filter="colTable"></table>
+
+<!-- 新增窗口内容 -->
+<div style="padding: 15px; display: none;" id="dom-win-col-add">
+
+    <form class="layui-form" lay-filter="form-col-add">
+
+        <div class="layui-form-item">
+            <label class="layui-form-label">花色名称</label>
+            <div class="layui-input-block">
+                <input type="text" name="co_name" required lay-verify="required"
+                       placeholder="请输入花色名称" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <label class="layui-form-label">花色说明</label>
+            <div class="layui-input-block">
+                <input type="text" name="co_remark" required lay-verify="required"
+                       placeholder="请输入花色说明" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <div class="layui-input-block">
+                <button class="layui-btn" lay-submit lay-filter="bn-col-do-add">提交</button>
+                <button type="reset" class="layui-btn layui-btn-primary">重置</button>
+            </div>
+        </div>
+    </form>
+</div>
+
+
+<script src="../../../static/layui-2.3.0/layui.js"></script>
+<script>
+    layui.use([ 'element', 'table', 'layer','form' ], function(){
+        var table = layui.table;
+        var layer = layui.layer;
+        var form = layui.form;
+
+        //第一个实例
+        var colTable =table.render({
+            elem: '#color-table'
+            ,height: 315
+            ,url:'colors' //数据接口
+            ,page:true
+            ,limit:3
+            ,limits:[3,6,9]
+            ,cols: [[ //表头
+                { type : 'checkbox'}
+                ,{field: 'co_id', title: '花色号'}
+                ,{field: 'co_name', title: '花色名称'}
+                ,{field: 'co_remark', title: '说明'}
+                ,{field: 'co_status', title: '状态'}
+            ]]
+        });
+
+    });
+</script>
+
+</body>
+</html>
diff --git a/src/main/web/WEB-INF/views/info/info.jsp b/src/main/web/WEB-INF/views/info/info.jsp
deleted file mode 100644
index f84c64fb4a6c75910a7ec1f378a248fb809a4755..0000000000000000000000000000000000000000
--- a/src/main/web/WEB-INF/views/info/info.jsp
+++ /dev/null
@@ -1,16 +0,0 @@
-<%--
-  Created by IntelliJ IDEA.
-  User: lenovo
-  Date: 2018/8/2
-  Time: 15:40
-  To change this template use File | Settings | File Templates.
---%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<html>
-<head>
-    <title>Title</title>
-</head>
-<body>
-
-</body>
-</html>