diff --git a/代码库/mall-admin/src/main/java/com/sock/mall/controller/CmsPrefrenceAreaController.java b/代码库/mall-admin/src/main/java/com/sock/mall/controller/CmsPrefrenceAreaController.java
new file mode 100644
index 0000000..5be5830
--- /dev/null
+++ b/代码库/mall-admin/src/main/java/com/sock/mall/controller/CmsPrefrenceAreaController.java
@@ -0,0 +1,34 @@
+package com.macro.mall.controller;
+
+import com.macro.mall.dto.CommonResult;
+import com.macro.mall.model.CmsPrefrenceArea;
+import com.macro.mall.service.CmsPrefrenceAreaService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+/**
+ * ��Ʒ��ѡ����Controller
+ * Created by macro on 2018/6/1.
+ */
+@Controller//��������������DispatcherServlet�ַ�������
+@Api(tags = "CmsPrefrenceAreaController", description = "��Ʒ��ѡ����")
+@RequestMapping("/prefrenceArea")//ӳ��
+public class CmsPrefrenceAreaController {
+    @Autowired//ע����Դ����������
+    private CmsPrefrenceAreaService prefrenceAreaService;
+
+    @ApiOperation("��ȡ������Ʒ��ѡ")
+    @RequestMapping(value = "/listAll", method = RequestMethod.GET)//��ʾ������/listAll.do��ʱ����ʵ���CmsPrefrenceAreaController��liseAll����
+    @ResponseBody//����ת����д��body��������JSON���ݻ���XML
+    public Object listAll() {
+        List<CmsPrefrenceArea> prefrenceAreaList = prefrenceAreaService.listAll();
+        return new CommonResult().success(prefrenceAreaList);//�ɹ��򷵻ذ���ȫ����Ʒ��listAll��
+    }
+}
\ No newline at end of file
diff --git a/代码库/mall-admin/src/main/java/com/sock/mall/controller/CmsSubjectController.java b/代码库/mall-admin/src/main/java/com/sock/mall/controller/CmsSubjectController.java
new file mode 100644
index 0000000..b18ad63
--- /dev/null
+++ b/代码库/mall-admin/src/main/java/com/sock/mall/controller/CmsSubjectController.java
@@ -0,0 +1,45 @@
+package com.macro.mall.controller;
+
+import com.macro.mall.dto.CommonResult;
+import com.macro.mall.model.CmsSubject;
+import com.macro.mall.service.CmsSubjectService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+/**
+ * ��Ʒר��Controller
+ * Created by macro on 2018/6/1.
+ */
+@Controller
+@Api(tags = "CmsSubjectController", description = "��Ʒר�����")
+@RequestMapping("/subject")
+public class CmsSubjectController {
+    @Autowired
+    private CmsSubjectService subjectService;
+
+    @ApiOperation("��ȡȫ����Ʒר��")
+    @RequestMapping(value = "/listAll", method = RequestMethod.GET)
+    @ResponseBody
+    public Object listAll() {
+        List<CmsSubject> subjectList = subjectService.listAll();
+        return new CommonResult().success(subjectList);
+    }
+
+    @ApiOperation(value = "����ר�����Ʒ�ҳ��ȡר��")
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    @ResponseBody
+    /*@RequestParam��HTTPServletRequest�������������������*/
+    public Object getList(@RequestParam(value = "keyword", required = false) String keyword,
+                          @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                          @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize) {
+        List<CmsSubject> subjectList = subjectService.list(keyword, pageNum, pageSize);
+        return new CommonResult().pageSuccess(subjectList);
+    }