diff --git a/app/Http/Controllers/Api/PublicController.php b/app/Http/Controllers/Api/PublicController.php
index 466ccc075..14edb7e3a 100755
--- a/app/Http/Controllers/Api/PublicController.php
+++ b/app/Http/Controllers/Api/PublicController.php
@@ -92,7 +92,7 @@ class PublicController extends AbstractController
         if ($key != $setting['key']) {
             return 'key error';
         }
-        $times = $setting['time'] ? Base::json2array($setting['time']) : ['00:00', '23:59'];
+        $times = $setting['time'] ? Base::json2array($setting['time']) : ['09:00', '18:00'];
         $advance = (intval($setting['advance']) ?: 120) * 60;
         $delay = (intval($setting['delay']) ?: 120) * 60;
         //
diff --git a/app/Http/Controllers/Api/SystemController.php b/app/Http/Controllers/Api/SystemController.php
index 5445c9798..647deebe2 100755
--- a/app/Http/Controllers/Api/SystemController.php
+++ b/app/Http/Controllers/Api/SystemController.php
@@ -267,7 +267,7 @@ class SystemController extends AbstractController
         }
         //
         $setting['open'] = $setting['open'] ?: 'close';
-        $setting['time'] = $setting['time'] ? Base::json2array($setting['time']) : ['00:00', '23:59'];
+        $setting['time'] = $setting['time'] ? Base::json2array($setting['time']) : ['09:00', '18:00'];
         $setting['advance'] = intval($setting['advance']) ?: 120;
         $setting['delay'] = intval($setting['delay']) ?: 120;
         $setting['remindin'] = intval($setting['remindin']) ?: 5;
diff --git a/app/Tasks/EmailNoticeTask.php b/app/Tasks/EmailNoticeTask.php
index cb599136d..981c2fb95 100644
--- a/app/Tasks/EmailNoticeTask.php
+++ b/app/Tasks/EmailNoticeTask.php
@@ -90,7 +90,7 @@ class EmailNoticeTask extends AbstractTask
             if (empty($data)) {
                 continue;
             }
-            $user = User::whereNull('disable_at')->find($userid);
+            $user = User::whereBot(0)->whereNull('disable_at')->find($userid);
             if (empty($user)) {
                 continue;
             }
diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js
index b7cfb3e2f..c09c85ea8 100644
--- a/resources/assets/js/app.js
+++ b/resources/assets/js/app.js
@@ -1,4 +1,4 @@
-const isElectron = window && window.process && window.process.type;
+const isElectron = !!(window && window.process && window.process.type);
 const isEEUiApp = window && window.navigator && /eeui/i.test(window.navigator.userAgent);
 
 import {switchLanguage as $L} from "./language";
diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue
index 772e01c18..d98829c62 100644
--- a/resources/assets/js/pages/manage.vue
+++ b/resources/assets/js/pages/manage.vue
@@ -2,7 +2,7 @@
     <div v-show="userId > 0" class="page-manage" :class="{'show-tabbar': showMobileTabbar}">
         <div class="manage-box-menu" :class="{'show768-menu': show768Menu}">
             <Dropdown
-                class="page-manage-menu-dropdown"
+                class="page-manage-menu-dropdown main-menu"
                 trigger="click"
                 @on-click="settingRoute"
                 @on-visible-change="menuVisibleChange">
diff --git a/resources/assets/js/pages/manage/setting/components/SystemCheckin.vue b/resources/assets/js/pages/manage/setting/components/SystemCheckin.vue
index e51795472..695053db4 100644
--- a/resources/assets/js/pages/manage/setting/components/SystemCheckin.vue
+++ b/resources/assets/js/pages/manage/setting/components/SystemCheckin.vue
@@ -46,7 +46,7 @@
                                     <label>{{ $L('分钟') }}</label>
                                 </div>
                             </FormItem>
-                            <div class="form-tip">{{$L('签到提醒对象：在职且3天内有签到过的成员')}}</div>
+                            <div class="form-tip">{{$L('签到提醒对象：3天内有签到的成员（法定工作日）')}}</div>
                         </Form>
                     </FormItem>
                     <FormItem :label="$L('允许修改')" prop="edit">
diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index 26baafab4..4b823dd1e 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -35,6 +35,7 @@ export default {
             state.dialogInputCache = await $A.IDBArray("dialogInputCache")
             state.fileLists = await $A.IDBArray("fileLists")
             state.userInfo = await $A.IDBJson("userInfo")
+            state.dialogUpdatedAt = await $A.IDBString("dialogUpdatedAt")
             state.dialogDeletedAt = await $A.IDBString("dialogDeletedAt")
             state.projectDeletedAt = await $A.IDBString("projectDeletedAt")
 
@@ -2169,7 +2170,7 @@ export default {
                         state.dialogDeletedAt = data.deleted_at
                         data.deleted_data.some(id => dispatch("forgetDialog", id))
                     });
-                    state.dialogUpdatedAt = $A.formatDate()
+                    $A.IDBSet("dialogUpdatedAt", state.dialogUpdatedAt = $A.formatDate()).then(_ => {})
                 }
                 //
                 if (data.next_page_url && data.current_page < 5) {
diff --git a/resources/assets/sass/pages/page-manage.scss b/resources/assets/sass/pages/page-manage.scss
index 5428533ba..666ab4f75 100644
--- a/resources/assets/sass/pages/page-manage.scss
+++ b/resources/assets/sass/pages/page-manage.scss
@@ -259,7 +259,9 @@
 
 .page-manage-menu-dropdown {
     flex-shrink: 0;
-    width: 86%;
+    &.main-menu {
+        width: 86%;
+    }
     .ivu-select-dropdown {
         padding: 7px 0;
         .ivu-dropdown-item {