diff --git a/admin/application/admin/controller/Firmcustomer.php b/admin/application/admin/controller/Firmcustomer.php
index 859b372..e40e567 100755
--- a/admin/application/admin/controller/Firmcustomer.php
+++ b/admin/application/admin/controller/Firmcustomer.php
@@ -17,7 +17,7 @@ use wanghua\general_utility_tools_php\tool\Tools;
  */
 class Firmcustomer extends Backend
 {
-    protected $noNeedRight = ['firmcustomerGetList'];
+    protected $noNeedRight = ['firmcustomerGetList','massagesindex','massagesindexnot'];
 
     /**
      * Firmcustomer模型对象
@@ -203,4 +203,93 @@ class Firmcustomer extends Backend
             ->select();
         return json(['list' => $data, 'total' => count($data)]);
     }
+
+    /** 群发展示
+     * @return string|\think\response\Json
+     * @throws Exception
+     * @throws \think\exception\DbException
+     */
+    public function massagesindex()
+    {
+        //当前是否为关联查询
+        $this->relationSearch = true;
+        //设置过滤方法
+        $this->request->filter(['strip_tags', 'trim']);
+        if ($this->request->isAjax()) {
+            //如果发送的来源是Selectpage，则转发到Selectpage
+            if ($this->request->request('keyField')) {
+                return $this->selectpage();
+            }
+
+            list($where, $sort, $order, $offset, $limit) = $this->buildparams();
+            $this->model->where('firmcustomer.firm_id',session_admin_firm_id());
+            $list = $this->model
+                ->with(['firmstoreprojectstwo','firmcustomerorigin']);
+            $field = 'fa_firmcustomer.*';
+            if (!empty(input('type'))){
+                $massId = input('ids');
+                $list = $list->join('fa_groupmessagescustomer gm','gm.customer_id = fa_firmcustomer.id','left')
+                    ->where('gm.groupmessages_id','=',$massId)
+                    ->whereNotNull('gm.id');
+                $field = 'fa_firmcustomer.*,gm.status as gm_status,gm.send_time';
+            }
+
+            $list = $list->where($where)
+                ->field($field)
+                ->order($sort, $order)
+                ->paginate($limit);
+
+            foreach ($list as $row) {
+                $row->getRelation('firmstoreprojectstwo')->visible(['name']);
+                $row->getRelation('firmcustomerorigin')->visible(['name']);
+            }
+
+            $result = array("total" => $list->total(), "rows" => $list->items());
+
+            return json($result);
+        }
+        $this->view->assign('type',empty(input('type'))?0:1);
+        return $this->view->fetch();
+    }
+    public function massagesindexnot()
+    {
+        //当前是否为关联查询
+        $this->relationSearch = true;
+        //设置过滤方法
+        $this->request->filter(['strip_tags', 'trim']);
+        if ($this->request->isAjax()) {
+            //如果发送的来源是Selectpage，则转发到Selectpage
+            if ($this->request->request('keyField')) {
+                return $this->selectpage();
+            }
+
+            list($where, $sort, $order, $offset, $limit) = $this->buildparams();
+            $this->model->where('firmcustomer.firm_id',session_admin_firm_id());
+            $list = $this->model
+                ->with(['firmstoreprojectstwo','firmcustomerorigin']);
+            $massId = input('ids');
+            $messIds = Db::table('fa_groupmessagescustomer')->where('groupmessages_id',$massId)->column('customer_id');
+            if (!empty($messIds)){
+                $list = $list->whereNotIn('fa_firmcustomer.id',$messIds);
+            }
+
+            $list = $list->where($where)
+                ->order($sort, $order)
+                ->paginate($limit);
+
+            foreach ($list as $row) {
+                $row->visible(['id','name','age','phone','rel_wx','rel_group','firmtags_ids','headimage','remark','responsible_pm','return_visit_content','status','create_time','admin_id']);
+                $row->visible(['firmstoreprojectstwo']);
+                $row->getRelation('firmstoreprojectstwo')->visible(['name']);
+                $row->visible(['firmcustomerorigin']);
+                $row->getRelation('firmcustomerorigin')->visible(['name']);
+            }
+
+            $result = array("total" => $list->total(), "rows" => $list->items(),'mess_id'=>$massId);
+
+            return json($result);
+        }
+        $this->view->assign('mess_id',input('ids'));
+        return $this->view->fetch();
+    }
 }
diff --git a/admin/application/admin/controller/Groupmessages.php b/admin/application/admin/controller/Groupmessages.php
new file mode 100644
index 0000000..edd34c8
--- /dev/null
+++ b/admin/application/admin/controller/Groupmessages.php
@@ -0,0 +1,188 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\common\controller\Backend;
+use app\index\controller\Tasktimer;
+use think\Db;
+use wanghua\general_utility_tools_php\tool\Tools;
+
+/**
+ * 群发
+ *
+ * @icon fa fa-circle-o
+ */
+class Groupmessages extends Backend
+{
+
+    /**
+     * Groupmessages模型对象
+     * @var \app\admin\model\Groupmessages
+     */
+    protected $model = null;
+
+    public function _initialize()
+    {
+        parent::_initialize();
+        $this->model = new \app\admin\model\Groupmessages;
+        $this->model->where('fa_groupmessages.firm_id',session_admin_firm_id());
+    }
+
+
+
+    /**
+     * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
+     * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
+     * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
+     */
+    public function add()
+    {
+        if (false === $this->request->isPost()) {
+            $customerIds = $this->request->get('ids');
+            $this->view->assign('customerIds',$customerIds);
+            return $this->view->fetch();
+        }
+        $params = $this->request->post('row/a');
+        $params['create_time'] = date('Y-m-d H:i:s');
+        $params['admin_name'] = session('admin')['username'];
+
+        if (empty($params)) {
+            $this->error(__('Parameter %s can not be empty', ''));
+        }
+        $params = $this->preExcludeFields($params);
+
+        if ($this->dataLimit && $this->dataLimitFieldAutoFill) {
+            $params[$this->dataLimitField] = $this->auth->id;
+        }
+        $customer_ids = explode(',',$params['customer_ids']);
+        $dataList = [];
+        $params['firm_id']=session_admin_firm_id();
+        unset($params['customer_ids']);
+        foreach ($customer_ids as $value){
+            $data = [];
+            $data['status'] ='pending';
+            $data['customer_id'] = $value;
+            $dataList[]=$data;
+        }
+        $result = false;
+        Db::startTrans();
+        try {
+            //是否采用模型验证
+            if ($this->modelValidate) {
+                $name = str_replace("\\model\\", "\\validate\\", get_class($this->model));
+                $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.add' : $name) : $this->modelValidate;
+                $this->model->validateFailException()->validate($validate);
+            }
+            $result = $this->model->allowField(true)->insertGetId($params);
+            if (!$result){
+                Db::rollback();
+                $this->error('添加失败，请重新操作');
+            }
+            foreach ($dataList as $key=>&$value){
+                $value['groupmessages_id'] = $result;
+            }
+            $contentResult = Db::table('fa_groupmessagescustomer')->insertAll($dataList);
+            if (!$contentResult){
+                Db::rollback();
+                $this->error('添加内容失败，请重新操作');
+            }
+            $sendResult = $this->sendMessages($result);
+            if (!$sendResult){
+                Db::rollback();
+                $this->error('发送内容失败，请重新操作');
+            }
+            Db::commit();
+        } catch (ValidateException|PDOException|Exception $e) {
+            Db::rollback();
+            $this->error($e->getMessage());
+        }
+        if ($result === false) {
+            $this->error(__('No rows were inserted'));
+        }
+        $this->success();
+    }
+
+    /**
+     * @return string|void 再次发送的客户
+     * @throws \think\Exception
+     */
+    public function addagain()
+    {
+        if (false === $this->request->isPost()) {
+            $customerIds = $this->request->get('ids');
+            $this->view->assign('customerIds',$customerIds);
+            return $this->view->fetch();
+        }
+        $params = $this->request->post();
+        if (empty($params)) {
+            $this->error(__('Parameter %s can not be empty', ''));
+        }
+        $params = $this->preExcludeFields($params);
+        if ($this->dataLimit && $this->dataLimitFieldAutoFill) {
+            $params[$this->dataLimitField] = $this->auth->id;
+        }
+        $mess_id = $params['mess_id'];
+        $messData = $this->model->where('id',$mess_id)->find();
+        if (empty($messData)) {
+            $this->error(__('Parameter %s can not be empty', ''));
+        }
+        $customer_ids = explode(',',$params['customer_ids']);
+        $dataList = [];
+        unset($params['customer_ids']);
+        foreach ($customer_ids as $value){
+            $data = [];
+            $data['status'] ='pending';
+            $data['customer_id'] = $value;
+            $dataList[]=$data;
+        }
+        Db::startTrans();
+        try {
+            //是否采用模型验证
+            if ($this->modelValidate) {
+                $name = str_replace("\\model\\", "\\validate\\", get_class($this->model));
+                $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.add' : $name) : $this->modelValidate;
+                $this->model->validateFailException()->validate($validate);
+            }
+            foreach ($dataList as $key=>&$value){
+                $value['groupmessages_id'] = $mess_id;
+            }
+            $contentResult = Db::table('fa_groupmessagescustomer')->insertAll($dataList);
+            if (!$contentResult){
+                Db::rollback();
+                $this->error('添加内容失败，请重新操作');
+            }
+            $sendResult = $this->sendMessages($mess_id);
+            if (!$sendResult){
+                Db::rollback();
+                $this->error('发送内容失败，请重新操作');
+            }
+            Db::commit();
+        } catch (ValidateException|PDOException|Exception $e) {
+            Db::rollback();
+            $this->error($e->getMessage());
+        }
+        $this->success();
+    }
+    protected function sendMessages($params){
+        $messageData = $this->model->where('id',$params)->find();
+        $sendList = Db::table('fa_groupmessagescustomer')
+            ->join('fa_firmcustomer', 'fa_firmcustomer.id = fa_groupmessagescustomer.customer_id','left')
+            ->where('groupmessages_id',$params)
+            ->where('fa_groupmessagescustomer.status','pending')
+            ->field('fa_firmcustomer.*,fa_groupmessagescustomer.id as gm_id')
+            ->select();
+        foreach ($sendList as $value){
+            Tools::log_to_write_txt(['群发，开始：$item'=>$value]);
+            $ret = (new Tasktimer())->postMatterText($value,['content'=>$messageData['messages_content']],'');
+            Tools::log_to_write_txt(['群发，结束：$res'=>$ret]);
+            if ($ret['code'] == 200){
+                Db::table('fa_groupmessagescustomer')->where('id',$value['gm_id'])->update(['status'=>'sent','send_time'=>date('Y-m-d H:i:s')]);
+            }else{
+                Db::table('fa_groupmessagescustomer')->where('id',$value['gm_id'])->update(['status'=>'failed']);
+            }
+        }
+        return true;
+    }
+
+
+}
diff --git a/admin/application/admin/lang/zh-cn/groupmessages.php b/admin/application/admin/lang/zh-cn/groupmessages.php
new file mode 100644
index 0000000..2688416
--- /dev/null
+++ b/admin/application/admin/lang/zh-cn/groupmessages.php
@@ -0,0 +1,8 @@
+<?php
+
+return [
+    'Id'               => '主键',
+    'Messages_content' => '信息内容',
+    'Create_time'      => '创建时间',
+    'Admin_name'       => '创建人名称'
+];
diff --git a/admin/application/admin/model/Groupmessages.php b/admin/application/admin/model/Groupmessages.php
new file mode 100644
index 0000000..e0aa742
--- /dev/null
+++ b/admin/application/admin/model/Groupmessages.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace app\admin\model;
+
+use think\Model;
+
+
+class Groupmessages extends Model
+{
+
+    
+
+    
+
+    // 表名
+    protected $name = 'groupmessages';
+    
+    // 自动写入时间戳字段
+    protected $autoWriteTimestamp = false;
+
+    // 定义时间戳字段名
+    protected $createTime = false;
+    protected $updateTime = false;
+    protected $deleteTime = false;
+
+    // 追加属性
+    protected $append = [
+
+    ];
+    
+
+    
+
+
+
+
+
+
+
+}
diff --git a/admin/application/admin/validate/Groupmessages.php b/admin/application/admin/validate/Groupmessages.php
new file mode 100644
index 0000000..68aae53
--- /dev/null
+++ b/admin/application/admin/validate/Groupmessages.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace app\admin\validate;
+
+use think\Validate;
+
+class Groupmessages extends Validate
+{
+    /**
+     * 验证规则
+     */
+    protected $rule = [
+    ];
+    /**
+     * 提示消息
+     */
+    protected $message = [
+    ];
+    /**
+     * 验证场景
+     */
+    protected $scene = [
+        'add'  => [],
+        'edit' => [],
+    ];
+    
+}
diff --git a/admin/application/admin/view/firmcustomer/massagesindex.html b/admin/application/admin/view/firmcustomer/massagesindex.html
new file mode 100755
index 0000000..da9a1b2
--- /dev/null
+++ b/admin/application/admin/view/firmcustomer/massagesindex.html
@@ -0,0 +1,36 @@
+<div class="panel panel-default panel-intro">
+    
+    <div class="panel-heading">
+        {:build_heading(null,FALSE)}
+        <ul class="nav nav-tabs" data-field="status">
+            <li class="{:$Think.get.status === null ? 'active' : ''}"><a href="#t-all" data-value="" data-toggle="tab">{:__('All')}</a></li>
+            {foreach name="statusList" item="vo"}
+            <li class="{:$Think.get.status === (string)$key ? 'active' : ''}"><a href="#t-{$key}" data-value="{$key}" data-toggle="tab">{$vo}</a></li>
+            {/foreach}
+        </ul>
+    </div>
+
+
+    <div class="panel-body">
+        <div id="myTabContent" class="tab-content">
+            <div class="tab-pane fade active in" id="one">
+                <div class="widget-body no-padding">
+                    <div id="toolbar" class="toolbar">
+                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
+                        {if $type==0}
+<!--                        <div class="dropdown btn-group {:$auth->check('firmcustomer/massagesindex')?'':'hide'}">-->
+                            <button type="button" id="submitButton" class="btn btn-success  btn-disabled disabled" title="{:__('一键群发')}" ><i class="fa fa-plus"></i> {:__('一键群发')}</button>
+<!--                        </div>-->
+                        {/if}
+                    </div>
+                    <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-edit=""
+                           data-operate-del=""
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>
diff --git a/admin/application/admin/view/firmcustomer/massagesindexnot.html b/admin/application/admin/view/firmcustomer/massagesindexnot.html
new file mode 100755
index 0000000..5323a00
--- /dev/null
+++ b/admin/application/admin/view/firmcustomer/massagesindexnot.html
@@ -0,0 +1,35 @@
+<div class="panel panel-default panel-intro">
+    
+    <div class="panel-heading">
+        {:build_heading(null,FALSE)}
+        <ul class="nav nav-tabs" data-field="status">
+            <li class="{:$Think.get.status === null ? 'active' : ''}"><a href="#t-all" data-value="" data-toggle="tab">{:__('All')}</a></li>
+            {foreach name="statusList" item="vo"}
+            <li class="{:$Think.get.status === (string)$key ? 'active' : ''}"><a href="#t-{$key}" data-value="{$key}" data-toggle="tab">{$vo}</a></li>
+            {/foreach}
+        </ul>
+    </div>
+
+    <input type="hidden" value="{$mess_id}" id="mess_id">
+    <div class="panel-body">
+        <div id="myTabContent" class="tab-content">
+            <div class="tab-pane fade active in" id="one">
+                <div class="widget-body no-padding">
+                    <div id="toolbar" class="toolbar">
+                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
+                        <div class="dropdown btn-group {:$auth->check('firmcustomer/massagesindexnot')?'':'hide'}">
+<!--                            <a href="groupmessages/add" class="btn btn-success btn-dialog dropdown-toggle btn-disabled disabled" title="{:__('一键群发')}" ><i class="fa fa-plus"></i> {:__('一键群发')}</a>-->
+                            <button type="button" id="submitButton"  class="btn btn-success  btn-disabled disabled" title="{:__('一键群发')}" ><i class="fa fa-plus"></i> {:__('一键群发')}</button>
+                        </div>
+                    </div>
+                    <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-edit=""
+                           data-operate-del=""
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>
diff --git a/admin/application/admin/view/groupmessages/add.html b/admin/application/admin/view/groupmessages/add.html
new file mode 100644
index 0000000..597ccb6
--- /dev/null
+++ b/admin/application/admin/view/groupmessages/add.html
@@ -0,0 +1,15 @@
+<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+    <input type="hidden" name="row[customer_ids]" value="{$customerIds}">
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Messages_content')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <textarea id="c-messages_content" class="form-control editor" rows="8" name="row[messages_content]" cols="50"></textarea>
+        </div>
+    </div>
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+        </div>
+    </div>
+</form>
diff --git a/admin/application/admin/view/groupmessages/addagain.html b/admin/application/admin/view/groupmessages/addagain.html
new file mode 100644
index 0000000..597ccb6
--- /dev/null
+++ b/admin/application/admin/view/groupmessages/addagain.html
@@ -0,0 +1,15 @@
+<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+    <input type="hidden" name="row[customer_ids]" value="{$customerIds}">
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Messages_content')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <textarea id="c-messages_content" class="form-control editor" rows="8" name="row[messages_content]" cols="50"></textarea>
+        </div>
+    </div>
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+        </div>
+    </div>
+</form>
diff --git a/admin/application/admin/view/groupmessages/edit.html b/admin/application/admin/view/groupmessages/edit.html
new file mode 100644
index 0000000..9e0bd71
--- /dev/null
+++ b/admin/application/admin/view/groupmessages/edit.html
@@ -0,0 +1,27 @@
+<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Messages_content')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <textarea id="c-messages_content" class="form-control editor" rows="5" name="row[messages_content]" cols="50">{$row.messages_content|htmlentities}</textarea>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Create_time')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-create_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[create_time]" type="text" value="{$row.create_time}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Admin_name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-admin_name" class="form-control" name="row[admin_name]" type="text" value="{$row.admin_name|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+        </div>
+    </div>
+</form>
diff --git a/admin/application/admin/view/groupmessages/index.html b/admin/application/admin/view/groupmessages/index.html
new file mode 100644
index 0000000..f47c910
--- /dev/null
+++ b/admin/application/admin/view/groupmessages/index.html
@@ -0,0 +1,26 @@
+<div class="panel panel-default panel-intro">
+    {:build_heading()}
+
+    <div class="panel-body">
+        <div id="myTabContent" class="tab-content">
+            <div class="tab-pane fade active in" id="one">
+                <div class="widget-body no-padding">
+                    <div id="toolbar" class="toolbar">
+                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
+
+
+                        
+
+                        
+                    </div>
+                    <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-edit=""
+                           data-operate-del=""
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>
diff --git a/admin/application/index/controller/Tasktimer.php b/admin/application/index/controller/Tasktimer.php
index 623a940..d878ac1 100755
--- a/admin/application/index/controller/Tasktimer.php
+++ b/admin/application/index/controller/Tasktimer.php
@@ -33,7 +33,7 @@ class Tasktimer extends Controller
             $this->returnPlan();
         });
         //生日通知
-        if (date("H:i:s") == "10:00:00"){
+        if (date("H:i") == "10:00"){
             Mmodel::catch(function (){
                 $this->returnBirthdayPlan();
             });
diff --git a/admin/public/assets/js/backend/groupmessages.js b/admin/public/assets/js/backend/groupmessages.js
new file mode 100644
index 0000000..36f1132
--- /dev/null
+++ b/admin/public/assets/js/backend/groupmessages.js
@@ -0,0 +1,85 @@
+define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+
+    var Controller = {
+        index: function () {
+            // 初始化表格参数配置
+            Table.api.init({
+                extend: {
+                    index_url: 'groupmessages/index' + location.search,
+                    add_url: 'groupmessages/add',
+                    edit_url: 'groupmessages/edit',
+                    del_url: 'groupmessages/del',
+                    multi_url: 'groupmessages/multi',
+                    import_url: 'groupmessages/import',
+                    table: 'groupmessages',
+                }
+            });
+
+            var table = $("#table");
+
+            // 初始化表格
+            table.bootstrapTable({
+                url: $.fn.bootstrapTable.defaults.extend.index_url,
+                pk: 'id',
+                sortName: 'id',
+                columns: [
+                    [
+                        {checkbox: true},
+                        {field: 'id', title: __('Id')},
+                        {field: 'messages_content', title: __('messages_content'),},
+                        {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
+                        {field: 'admin_name', title: __('Admin_name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate,
+                        buttons: [
+                            {
+                                name: 'addSendTime',
+                                text: __('已发送客户'),
+                                title: __('已发送客户'),
+                                classname: 'btn btn-xs btn-primary btn-dialog',
+                                icon: 'fa fa-magic',
+                                url: 'firmcustomer/massagesindex?type=1',
+                                callback: function (data) {
+                                    Layer.alert("接收到回传数据：" + JSON.stringify(data), {title: "回传数据"});
+                                },
+                                visible: function (row) {
+                                    //返回true时按钮显示,返回false隐藏
+                                    return true;
+                                }
+                            },
+                            {
+                                name: 'addSendTime',
+                                text: __('未发送客户'),
+                                title: __('未发送客户'),
+                                classname: 'btn btn-xs btn-danger btn-dialog',
+                                icon: 'fa fa-magic',
+                                url: 'firmcustomer/massagesindexnot?type=1',
+                                callback: function (data) {
+                                    Layer.alert("接收到回传数据：" + JSON.stringify(data), {title: "回传数据"});
+                                },
+                                visible: function (row) {
+                                    //返回true时按钮显示,返回false隐藏
+                                    return true;
+                                }
+                            },
+                        ]}
+                    ]
+                ]
+            });
+
+            // 为表格绑定事件
+            Table.api.bindevent(table);
+        },
+        add: function () {
+            Controller.api.bindevent();
+        },
+        edit: function () {
+            Controller.api.bindevent();
+        },
+        api: {
+            bindevent: function () {
+                Form.api.bindevent($("form[role=form]"));
+            }
+        }
+    };
+    return Controller;
+});
diff --git a/superadmin/application/admin/controller/Firmcustomer.php b/superadmin/application/admin/controller/Firmcustomer.php
index 3e6dbd1..81fd6ab 100755
--- a/superadmin/application/admin/controller/Firmcustomer.php
+++ b/superadmin/application/admin/controller/Firmcustomer.php
@@ -229,10 +229,7 @@ class Firmcustomer extends Backend
                 ->paginate($limit);
 
             foreach ($list as $row) {
-//                $row->visible(['id','name','age','phone','rel_wx','rel_group','firmtags_ids','headimage','remark','responsible_pm','return_visit_content','status','create_time','admin_id']);
-//                $row->visible(['firmstoreprojectstwo']);
                 $row->getRelation('firmstoreprojectstwo')->visible(['name']);
-//                $row->visible(['firmcustomerorigin']);
                 $row->getRelation('firmcustomerorigin')->visible(['name']);
                }
 
@@ -275,10 +272,6 @@ class Firmcustomer extends Backend
                 $row->getRelation('firmstoreprojectstwo')->visible(['name']);
                 $row->visible(['firmcustomerorigin']);
                 $row->getRelation('firmcustomerorigin')->visible(['name']);
-                //$row->visible(['admin']);
-                //$row->getRelation('admin')->visible(['nickname']);
-                $row->admin_id = Db::table('fa_admin')->where('id',$row->admin_id)->value('nickname');
-                $row->responsible_pm = Db::table('fa_admin')->where('id',$row->responsible_pm)->value('nickname');
             }
 
             $result = array("total" => $list->total(), "rows" => $list->items(),'mess_id'=>$massId);
diff --git a/superadmin/application/admin/view/groupmessages/add.html b/superadmin/application/admin/view/groupmessages/add.html
index 597ccb6..fb4574f 100644
--- a/superadmin/application/admin/view/groupmessages/add.html
+++ b/superadmin/application/admin/view/groupmessages/add.html
@@ -1,5 +1,13 @@
 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
     <input type="hidden" name="row[customer_ids]" value="{$customerIds}">
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('企业')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-firm_id" min="0" data-rule="required"
+                   data-source="firm/index" class="form-control selectpage"
+                   name="row[firm_id]" type="text" value="">
+        </div>
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Messages_content')}:</label>
         <div class="col-xs-12 col-sm-8">