diff --git a/SQL02-数据初始化.sql b/SQL02-数据初始化.sql
index 357f51194..452a3851a 100644
--- a/SQL02-数据初始化.sql
+++ b/SQL02-数据初始化.sql
@@ -3844,7 +3844,7 @@ INSERT INTO `system_menu` VALUES (82, 73, '邮费模板管理', 'layui-icon layu
 INSERT INTO `system_menu` VALUES (83, 73, '配送区域管理', 'layui-icon layui-icon-location', 'data/shop_truck_template/region', 'data/shop_truck_template/region', '', '_self', 0, 1, '2020-09-17 09:13:35');
 INSERT INTO `system_menu` VALUES (84, 68, '微信小程序配置', 'layui-icon layui-icon-set', 'data/base_config/wxapp', 'data/base_config/wxapp', '', '_self', 5, 1, '2020-09-21 16:34:08');
 INSERT INTO `system_menu` VALUES (87, 68, '支付参数管理', 'layui-icon layui-icon-rmb', 'data/shop_payment/index', 'data/shop_payment/index', '', '_self', 6, 1, '2020-12-12 09:08:09');
-INSERT INTO `system_menu` VALUES (88, 68, '系统通知管理', 'layui-icon layui-icon-notice', 'data/base_notify/index', 'data/base_notify/index', '', '_self', 6, 1, '2021-01-20 10:07:32');
+INSERT INTO `system_menu` VALUES (88, 68, '系统通知管理', 'layui-icon layui-icon-notice', 'data/base_message/index', 'data/base_message/index', '', '_self', 6, 1, '2021-01-20 10:07:32');
 INSERT INTO `system_menu` VALUES (89, 90, '余额充值管理', 'layui-icon layui-icon-rmb', 'data/user_balance/index', 'data/user_balance/index', '', '_self', 800, 1, '2021-01-20 10:09:49');
 INSERT INTO `system_menu` VALUES (90, 67, '用户管理', '', '', '#', '', '_self', 0, 1, '2021-01-22 05:43:01');
 INSERT INTO `system_menu` VALUES (91, 90, '用户等级管理', 'layui-icon layui-icon-senior', 'data/base_upgrade/index', 'data/base_upgrade/index', '', '_self', 700, 1, '2021-01-22 05:43:27');
diff --git a/app/data/controller/BaseNotify.php b/app/data/controller/BaseMessage.php
similarity index 95%
rename from app/data/controller/BaseNotify.php
rename to app/data/controller/BaseMessage.php
index 09fe42cdd..d9e6f4131 100644
--- a/app/data/controller/BaseNotify.php
+++ b/app/data/controller/BaseMessage.php
@@ -6,16 +6,16 @@ use think\admin\Controller;
 
 /**
  * 用户通知管理
- * Class BaseNotify
+ * Class BaseMessage
  * @package app\data\controller
  */
-class BaseNotify extends Controller
+class BaseMessage extends Controller
 {
     /**
      * 绑定数据表
      * @var string
      */
-    private $table = 'DataBaseNotify';
+    private $table = 'DataBaseMessage';
 
     /**
      * 系统通知管理
diff --git a/app/data/view/base_notify/form.html b/app/data/view/base_message/form.html
similarity index 100%
rename from app/data/view/base_notify/form.html
rename to app/data/view/base_message/form.html
diff --git a/app/data/view/base_notify/index.html b/app/data/view/base_message/index.html
similarity index 98%
rename from app/data/view/base_notify/index.html
rename to app/data/view/base_message/index.html
index df541eb6d..89eee05da 100644
--- a/app/data/view/base_notify/index.html
+++ b/app/data/view/base_message/index.html
@@ -13,7 +13,7 @@
 
 {block name='content'}
 <div class="think-box-shadow">
-    {include file='base_notify/index_search'}
+    {include file='base_message/index_search'}
     <table class="layui-table margin-top-10" lay-skin="line">
         {notempty name='list'}
         <thead>
diff --git a/app/data/view/base_notify/index_search.html b/app/data/view/base_message/index_search.html
similarity index 100%
rename from app/data/view/base_notify/index_search.html
rename to app/data/view/base_message/index_search.html
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index e8ed3a113..fb95e12b2 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -195,27 +195,27 @@ return array(
     'app\\admin\\controller\\Oplog' => $baseDir . '/app/admin/controller/Oplog.php',
     'app\\admin\\controller\\Queue' => $baseDir . '/app/admin/controller/Queue.php',
     'app\\admin\\controller\\User' => $baseDir . '/app/admin/controller/User.php',
-    'app\\admin\\controller\\api\\Plugs' => $baseDir . '/app/admin/controller/api/Plugs.php',
-    'app\\admin\\controller\\api\\Queue' => $baseDir . '/app/admin/controller/api/Queue.php',
-    'app\\admin\\controller\\api\\Update' => $baseDir . '/app/admin/controller/api/Update.php',
-    'app\\admin\\controller\\api\\Upload' => $baseDir . '/app/admin/controller/api/Upload.php',
-    'app\\data\\command\\OrderClean' => $baseDir . '/app/data/command/OrderClean.php',
-    'app\\data\\command\\UserAmount' => $baseDir . '/app/data/command/UserAmount.php',
-    'app\\data\\command\\UserTransfer' => $baseDir . '/app/data/command/UserTransfer.php',
-    'app\\data\\command\\UserUpgrade' => $baseDir . '/app/data/command/UserUpgrade.php',
-    'app\\data\\controller\\BaseConfig' => $baseDir . '/app/data/controller/BaseConfig.php',
-    'app\\data\\controller\\BaseDiscount' => $baseDir . '/app/data/controller/BaseDiscount.php',
-    'app\\data\\controller\\BaseNotify' => $baseDir . '/app/data/controller/BaseNotify.php',
-    'app\\data\\controller\\BaseUpgrade' => $baseDir . '/app/data/controller/BaseUpgrade.php',
-    'app\\data\\controller\\NewsItem' => $baseDir . '/app/data/controller/NewsItem.php',
-    'app\\data\\controller\\NewsMark' => $baseDir . '/app/data/controller/NewsMark.php',
-    'app\\data\\controller\\ShopGoods' => $baseDir . '/app/data/controller/ShopGoods.php',
-    'app\\data\\controller\\ShopGoodsCate' => $baseDir . '/app/data/controller/ShopGoodsCate.php',
-    'app\\data\\controller\\ShopGoodsMark' => $baseDir . '/app/data/controller/ShopGoodsMark.php',
-    'app\\data\\controller\\ShopOrder' => $baseDir . '/app/data/controller/ShopOrder.php',
-    'app\\data\\controller\\ShopOrderSend' => $baseDir . '/app/data/controller/ShopOrderSend.php',
+    'app\\admin\\controller\\api\\Plugs'      => $baseDir . '/app/admin/controller/api/Plugs.php',
+    'app\\admin\\controller\\api\\Queue'      => $baseDir . '/app/admin/controller/api/Queue.php',
+    'app\\admin\\controller\\api\\Update'     => $baseDir . '/app/admin/controller/api/Update.php',
+    'app\\admin\\controller\\api\\Upload'     => $baseDir . '/app/admin/controller/api/Upload.php',
+    'app\\data\\command\\OrderClean'          => $baseDir . '/app/data/command/OrderClean.php',
+    'app\\data\\command\\UserAmount'          => $baseDir . '/app/data/command/UserAmount.php',
+    'app\\data\\command\\UserTransfer'        => $baseDir . '/app/data/command/UserTransfer.php',
+    'app\\data\\command\\UserUpgrade'         => $baseDir . '/app/data/command/UserUpgrade.php',
+    'app\\data\\controller\\BaseConfig'       => $baseDir . '/app/data/controller/BaseConfig.php',
+    'app\\data\\controller\\BaseDiscount'     => $baseDir . '/app/data/controller/BaseDiscount.php',
+    'app\\data\\controller\\BaseMessage'      => $baseDir . '/app/data/controller/BaseNotify.php',
+    'app\\data\\controller\\BaseUpgrade'      => $baseDir . '/app/data/controller/BaseUpgrade.php',
+    'app\\data\\controller\\NewsItem'         => $baseDir . '/app/data/controller/NewsItem.php',
+    'app\\data\\controller\\NewsMark'         => $baseDir . '/app/data/controller/NewsMark.php',
+    'app\\data\\controller\\ShopGoods'        => $baseDir . '/app/data/controller/ShopGoods.php',
+    'app\\data\\controller\\ShopGoodsCate'    => $baseDir . '/app/data/controller/ShopGoodsCate.php',
+    'app\\data\\controller\\ShopGoodsMark'    => $baseDir . '/app/data/controller/ShopGoodsMark.php',
+    'app\\data\\controller\\ShopOrder'        => $baseDir . '/app/data/controller/ShopOrder.php',
+    'app\\data\\controller\\ShopOrderSend'    => $baseDir . '/app/data/controller/ShopOrderSend.php',
     'app\\data\\controller\\ShopOrderService' => $baseDir . '/app/data/controller/ShopOrderService.php',
-    'app\\data\\controller\\ShopPayment' => $baseDir . '/app/data/controller/ShopPayment.php',
+    'app\\data\\controller\\ShopPayment'      => $baseDir . '/app/data/controller/ShopPayment.php',
     'app\\data\\controller\\ShopPaymentItem' => $baseDir . '/app/data/controller/ShopPaymentItem.php',
     'app\\data\\controller\\ShopTruckCompany' => $baseDir . '/app/data/controller/ShopTruckCompany.php',
     'app\\data\\controller\\ShopTruckTemplate' => $baseDir . '/app/data/controller/ShopTruckTemplate.php',
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 8684b2c52..026c07ad1 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -324,27 +324,27 @@ class ComposerStaticInit6dcb8a18f830adceacf76408fbd14a53
         'app\\admin\\controller\\Oplog' => __DIR__ . '/../..' . '/app/admin/controller/Oplog.php',
         'app\\admin\\controller\\Queue' => __DIR__ . '/../..' . '/app/admin/controller/Queue.php',
         'app\\admin\\controller\\User' => __DIR__ . '/../..' . '/app/admin/controller/User.php',
-        'app\\admin\\controller\\api\\Plugs' => __DIR__ . '/../..' . '/app/admin/controller/api/Plugs.php',
-        'app\\admin\\controller\\api\\Queue' => __DIR__ . '/../..' . '/app/admin/controller/api/Queue.php',
-        'app\\admin\\controller\\api\\Update' => __DIR__ . '/../..' . '/app/admin/controller/api/Update.php',
-        'app\\admin\\controller\\api\\Upload' => __DIR__ . '/../..' . '/app/admin/controller/api/Upload.php',
-        'app\\data\\command\\OrderClean' => __DIR__ . '/../..' . '/app/data/command/OrderClean.php',
-        'app\\data\\command\\UserAmount' => __DIR__ . '/../..' . '/app/data/command/UserAmount.php',
-        'app\\data\\command\\UserTransfer' => __DIR__ . '/../..' . '/app/data/command/UserTransfer.php',
-        'app\\data\\command\\UserUpgrade' => __DIR__ . '/../..' . '/app/data/command/UserUpgrade.php',
-        'app\\data\\controller\\BaseConfig' => __DIR__ . '/../..' . '/app/data/controller/BaseConfig.php',
-        'app\\data\\controller\\BaseDiscount' => __DIR__ . '/../..' . '/app/data/controller/BaseDiscount.php',
-        'app\\data\\controller\\BaseNotify' => __DIR__ . '/../..' . '/app/data/controller/BaseNotify.php',
-        'app\\data\\controller\\BaseUpgrade' => __DIR__ . '/../..' . '/app/data/controller/BaseUpgrade.php',
-        'app\\data\\controller\\NewsItem' => __DIR__ . '/../..' . '/app/data/controller/NewsItem.php',
-        'app\\data\\controller\\NewsMark' => __DIR__ . '/../..' . '/app/data/controller/NewsMark.php',
-        'app\\data\\controller\\ShopGoods' => __DIR__ . '/../..' . '/app/data/controller/ShopGoods.php',
-        'app\\data\\controller\\ShopGoodsCate' => __DIR__ . '/../..' . '/app/data/controller/ShopGoodsCate.php',
-        'app\\data\\controller\\ShopGoodsMark' => __DIR__ . '/../..' . '/app/data/controller/ShopGoodsMark.php',
-        'app\\data\\controller\\ShopOrder' => __DIR__ . '/../..' . '/app/data/controller/ShopOrder.php',
-        'app\\data\\controller\\ShopOrderSend' => __DIR__ . '/../..' . '/app/data/controller/ShopOrderSend.php',
+        'app\\admin\\controller\\api\\Plugs'      => __DIR__ . '/../..' . '/app/admin/controller/api/Plugs.php',
+        'app\\admin\\controller\\api\\Queue'      => __DIR__ . '/../..' . '/app/admin/controller/api/Queue.php',
+        'app\\admin\\controller\\api\\Update'     => __DIR__ . '/../..' . '/app/admin/controller/api/Update.php',
+        'app\\admin\\controller\\api\\Upload'     => __DIR__ . '/../..' . '/app/admin/controller/api/Upload.php',
+        'app\\data\\command\\OrderClean'          => __DIR__ . '/../..' . '/app/data/command/OrderClean.php',
+        'app\\data\\command\\UserAmount'          => __DIR__ . '/../..' . '/app/data/command/UserAmount.php',
+        'app\\data\\command\\UserTransfer'        => __DIR__ . '/../..' . '/app/data/command/UserTransfer.php',
+        'app\\data\\command\\UserUpgrade'         => __DIR__ . '/../..' . '/app/data/command/UserUpgrade.php',
+        'app\\data\\controller\\BaseConfig'       => __DIR__ . '/../..' . '/app/data/controller/BaseConfig.php',
+        'app\\data\\controller\\BaseDiscount'     => __DIR__ . '/../..' . '/app/data/controller/BaseDiscount.php',
+        'app\\data\\controller\\BaseMessage'      => __DIR__ . '/../..' . '/app/data/controller/BaseNotify.php',
+        'app\\data\\controller\\BaseUpgrade'      => __DIR__ . '/../..' . '/app/data/controller/BaseUpgrade.php',
+        'app\\data\\controller\\NewsItem'         => __DIR__ . '/../..' . '/app/data/controller/NewsItem.php',
+        'app\\data\\controller\\NewsMark'         => __DIR__ . '/../..' . '/app/data/controller/NewsMark.php',
+        'app\\data\\controller\\ShopGoods'        => __DIR__ . '/../..' . '/app/data/controller/ShopGoods.php',
+        'app\\data\\controller\\ShopGoodsCate'    => __DIR__ . '/../..' . '/app/data/controller/ShopGoodsCate.php',
+        'app\\data\\controller\\ShopGoodsMark'    => __DIR__ . '/../..' . '/app/data/controller/ShopGoodsMark.php',
+        'app\\data\\controller\\ShopOrder'        => __DIR__ . '/../..' . '/app/data/controller/ShopOrder.php',
+        'app\\data\\controller\\ShopOrderSend'    => __DIR__ . '/../..' . '/app/data/controller/ShopOrderSend.php',
         'app\\data\\controller\\ShopOrderService' => __DIR__ . '/../..' . '/app/data/controller/ShopOrderService.php',
-        'app\\data\\controller\\ShopPayment' => __DIR__ . '/../..' . '/app/data/controller/ShopPayment.php',
+        'app\\data\\controller\\ShopPayment'      => __DIR__ . '/../..' . '/app/data/controller/ShopPayment.php',
         'app\\data\\controller\\ShopPaymentItem' => __DIR__ . '/../..' . '/app/data/controller/ShopPaymentItem.php',
         'app\\data\\controller\\ShopTruckCompany' => __DIR__ . '/../..' . '/app/data/controller/ShopTruckCompany.php',
         'app\\data\\controller\\ShopTruckTemplate' => __DIR__ . '/../..' . '/app/data/controller/ShopTruckTemplate.php',