diff --git a/Server/application/chukebao/controller/FollowUpController.php b/Server/application/chukebao/controller/FollowUpController.php
new file mode 100644
index 00000000..dbefba17
--- /dev/null
+++ b/Server/application/chukebao/controller/FollowUpController.php
@@ -0,0 +1,143 @@
+<?php
+
+namespace app\chukebao\controller;
+
+use app\chukebao\model\FollowUp;
+use library\ResponseHelper;
+use think\Db;
+
+class FollowUpController extends BaseController
+{
+
+    public function getList(){
+        $page = $this->request->param('page', 1);
+        $limit =  $this->request->param('limit', 10);
+        $keyword =  $this->request->param('keyword', '');
+        $isRemind =  $this->request->param('isRemind', '');
+        $isProcess =  $this->request->param('isProcess', '');
+        $type =  $this->request->param('type', '');
+        $userId = $this->getUserInfo('id');
+        $companyId = $this->getUserInfo('companyId');
+
+
+        $where = [
+            ['companyId','=',$companyId],
+            ['userId' ,'=', $userId]
+        ];
+
+        if ($isRemind != '') {
+            $where[] = ['isRemind','=',$isRemind];
+        }
+        if ($type != '') {
+            $where[] = ['type','=',$type];
+        }
+        if ($isProcess != '') {
+            $where[] = ['isProcess','=',$isProcess];
+        }
+
+        if(!empty($keyword)){
+            $where[] = ['title|description','like','%'.$keyword.'%'];
+        }
+
+        $query = FollowUp::where($where);
+
+        $list = $query->where($where)->page($page,$limit)->order('id desc')->select();
+        $total = $query->count();
+
+        foreach ($list as &$item) {
+            $nickname = Db::table('s2_wechat_friend')->where(['id' => $item['friendId']])->value('nickname');
+            $item['nickname'] = !empty($nickname) ? $nickname : '-';
+            $item['reminderTime'] = date('Y-m-d H:i:s',$item['reminderTime']);
+        }
+        unset($item);
+
+        return ResponseHelper::success(['list'=>$list,'total'=>$total]);
+    }
+
+
+    /**
+     * 添加
+     * @return \think\response\Json
+     * @throws \Exception
+     */
+    public function create(){
+        $type =  $this->request->param('type', 0);
+        $title =  $this->request->param('title', '');
+        $reminderTime =  $this->request->param('reminderTime', '');
+        $description =  $this->request->param('description', '');
+        $friendId =  $this->request->param('friendId', '');
+        $userId = $this->getUserInfo('id');
+        $companyId = $this->getUserInfo('companyId');
+
+        if (empty($title) || empty($reminderTime) || empty($description) || empty($friendId)){
+            return ResponseHelper::error('参数缺失');
+        }
+        $friend = Db::name('wechat_friendship')->where(['id' => $friendId,'companyId' => $companyId])->find();
+        if (empty($friend)) {
+            return ResponseHelper::error('好友不存在');
+        }
+
+
+        Db::startTrans();
+        try {
+            $FollowUp = new FollowUp();
+            $FollowUp->type = $type;
+            $FollowUp->title = $title;
+            $FollowUp->friendId = $friendId;
+            $FollowUp->reminderTime = !empty($reminderTime) ? strtotime($reminderTime) : time();
+            $FollowUp->description = $description;
+            $FollowUp->userId = $userId;
+            $FollowUp->companyId = $companyId;
+            $FollowUp->updateTime = time();
+            $FollowUp->createTime = time();
+            $FollowUp->save();
+            Db::commit();
+            return ResponseHelper::success(' ','创建成功');
+        } catch (\Exception $e) {
+            Db::rollback();
+            return ResponseHelper::error('创建失败：'.$e->getMessage());
+        }
+    }
+
+
+    /**
+     * 处理代办事项
+     * @return \think\response\Json
+     * @throws \Exception
+     */
+    public function process(){
+        $ids = $this->request->param('ids','');
+        $userId = $this->getUserInfo('id');
+        $companyId = $this->getUserInfo('companyId');
+
+        if (empty($ids)){
+            return ResponseHelper::error('参数缺失');
+        }
+        $ids = explode(',',$ids);
+
+        if (!is_array($ids)){
+            return ResponseHelper::error('格式错误');
+        }
+
+        $FollowUpIds = FollowUp::where(['userId' => $userId,'companyId' => $companyId,'isProcess' => 0])->whereIn('id',$ids)->column('id');
+        if (empty($FollowUpIds)){
+            return ResponseHelper::error('代办事项不存在');
+        }
+
+        Db::startTrans();
+        try {
+            FollowUp::whereIn('id',$FollowUpIds)->update(['isProcess' => 1,'isRemind' => 1,'updateTime' => time()]);
+            Db::commit();
+            return ResponseHelper::success(' ','已处理');
+        } catch (\Exception $e) {
+            Db::rollback();
+            return ResponseHelper::error('处理失败：'.$e->getMessage());
+        }
+
+
+
+
+
+    }
+
+}
\ No newline at end of file
diff --git a/Server/application/chukebao/controller/ToDoController.php b/Server/application/chukebao/controller/ToDoController.php
new file mode 100644
index 00000000..c71ab30b
--- /dev/null
+++ b/Server/application/chukebao/controller/ToDoController.php
@@ -0,0 +1,143 @@
+<?php
+
+namespace app\chukebao\controller;
+
+use app\chukebao\model\ToDo;
+use library\ResponseHelper;
+use think\Db;
+
+class ToDoController extends BaseController
+{
+
+    public function getList(){
+        $page = $this->request->param('page', 1);
+        $limit =  $this->request->param('limit', 10);
+        $keyword =  $this->request->param('keyword', '');
+        $isRemind =  $this->request->param('isRemind', '');
+        $isProcess =  $this->request->param('isProcess', '');
+        $level =  $this->request->param('level', '');
+        $userId = $this->getUserInfo('id');
+        $companyId = $this->getUserInfo('companyId');
+
+
+        $where = [
+            ['companyId','=',$companyId],
+            ['userId' ,'=', $userId]
+        ];
+
+        if ($isRemind != '') {
+            $where[] = ['isRemind','=',$isRemind];
+        }
+        if ($level != '') {
+            $where[] = ['level','=',$level];
+        }
+        if ($isProcess != '') {
+            $where[] = ['isProcess','=',$isProcess];
+        }
+
+        if(!empty($keyword)){
+            $where[] = ['title|description','like','%'.$keyword.'%'];
+        }
+
+        $query = ToDo::where($where);
+
+        $list = $query->where($where)->page($page,$limit)->order('id desc')->select();
+        $total = $query->count();
+
+        foreach ($list as &$item) {
+            $nickname = Db::table('s2_wechat_friend')->where(['id' => $item['friendId']])->value('nickname');
+            $item['nickname'] = !empty($nickname) ? $nickname : '-';
+            $item['reminderTime'] = date('Y-m-d H:i:s',$item['reminderTime']);
+        }
+        unset($item);
+
+        return ResponseHelper::success(['list'=>$list,'total'=>$total]);
+    }
+
+
+    /**
+     * 添加
+     * @return \think\response\Json
+     * @throws \Exception
+     */
+    public function create(){
+        $level =  $this->request->param('level', 0);
+        $title =  $this->request->param('title', '');
+        $reminderTime =  $this->request->param('reminderTime', '');
+        $description =  $this->request->param('description', '');
+        $friendId =  $this->request->param('friendId', '');
+        $userId = $this->getUserInfo('id');
+        $companyId = $this->getUserInfo('companyId');
+
+        if (empty($title) || empty($reminderTime) || empty($description) || empty($friendId)){
+            return ResponseHelper::error('参数缺失');
+        }
+        $friend = Db::name('wechat_friendship')->where(['id' => $friendId,'companyId' => $companyId])->find();
+        if (empty($friend)) {
+            return ResponseHelper::error('好友不存在');
+        }
+
+
+        Db::startTrans();
+        try {
+            $todo = new ToDo();
+            $todo->level = $level;
+            $todo->title = $title;
+            $todo->friendId = $friendId;
+            $todo->reminderTime = !empty($reminderTime) ? strtotime($reminderTime) : time();
+            $todo->description = $description;
+            $todo->userId = $userId;
+            $todo->companyId = $companyId;
+            $todo->updateTime = time();
+            $todo->createTime = time();
+            $todo->save();
+            Db::commit();
+            return ResponseHelper::success(' ','创建成功');
+        } catch (\Exception $e) {
+            Db::rollback();
+            return ResponseHelper::error('创建失败：'.$e->getMessage());
+        }
+    }
+
+
+    /**
+     * 处理代办事项
+     * @return \think\response\Json
+     * @throws \Exception
+     */
+    public function process(){
+        $ids = $this->request->param('ids','');
+        $userId = $this->getUserInfo('id');
+        $companyId = $this->getUserInfo('companyId');
+
+        if (empty($ids)){
+            return ResponseHelper::error('参数缺失');
+        }
+        $ids = explode(',',$ids);
+
+        if (!is_array($ids)){
+            return ResponseHelper::error('格式错误');
+        }
+
+        $todoIds = ToDo::where(['userId' => $userId,'companyId' => $companyId,'isProcess' => 0])->whereIn('id',$ids)->column('id');
+        if (empty($todoIds)){
+            return ResponseHelper::error('代办事项不存在');
+        }
+
+        Db::startTrans();
+        try {
+            ToDo::whereIn('id',$todoIds)->update(['isProcess' => 1,'isRemind' => 1,'updateTime' => time()]);
+            Db::commit();
+            return ResponseHelper::success(' ','已处理');
+        } catch (\Exception $e) {
+            Db::rollback();
+            return ResponseHelper::error('处理失败：'.$e->getMessage());
+        }
+
+
+
+
+
+    }
+
+}
\ No newline at end of file
diff --git a/Server/application/chukebao/model/FollowUp.php b/Server/application/chukebao/model/FollowUp.php
new file mode 100644
index 00000000..4d00524f
--- /dev/null
+++ b/Server/application/chukebao/model/FollowUp.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace app\chukebao\model;
+
+use think\Model;
+class FollowUp extends Model
+{
+    protected $pk = 'id';
+    protected $name  = 'follow_up';
+
+    // 自动写入时间戳
+    protected $autoWriteTimestamp = true;
+    protected $createTime = 'createTime';
+    protected $updateTime = 'updateTime';
+
+
+}
\ No newline at end of file
diff --git a/Server/application/chukebao/model/ToDo.php b/Server/application/chukebao/model/ToDo.php
new file mode 100644
index 00000000..34c07b77
--- /dev/null
+++ b/Server/application/chukebao/model/ToDo.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace app\chukebao\model;
+
+use think\Model;
+class ToDo extends Model
+{
+    protected $pk = 'id';
+    protected $name  = 'to_do';
+
+    // 自动写入时间戳
+    protected $autoWriteTimestamp = true;
+    protected $createTime = 'createTime';
+    protected $updateTime = 'updateTime';
+
+
+}
\ No newline at end of file