diff --git a/app/Models/AbstractModel.php b/app/Models/AbstractModel.php index 03b6a614a..941a8607e 100644 --- a/app/Models/AbstractModel.php +++ b/app/Models/AbstractModel.php @@ -21,6 +21,7 @@ use Illuminate\Support\Facades\DB; * @method static \Illuminate\Database\Eloquent\Model|object|static|null cancelHidden() * @method static \Illuminate\Database\Eloquent\Builder|static with($relations) * @method static \Illuminate\Database\Query\Builder|static select($columns = []) + * @method static \Illuminate\Database\Query\Builder|static whereIn($column, $values, $boolean = 'and', $not = false) * @method static \Illuminate\Database\Query\Builder|static whereNotIn($column, $values, $boolean = 'and') * @mixin \Eloquent */ diff --git a/language/original-api.txt b/language/original-api.txt index 034354a32..6155a13ce 100644 --- a/language/original-api.txt +++ b/language/original-api.txt @@ -374,6 +374,7 @@ LDAP 用户禁止修改邮箱 生成重复任务失败:(*) success +error 晚上 傍晚 下午 diff --git a/language/translate.json b/language/translate.json index ec470a5c9..e526b8d2b 100644 --- a/language/translate.json +++ b/language/translate.json @@ -11223,7 +11223,7 @@ "key": "设待办", "zh": "", "zh-CHT": "設待辦", - "en": "Set up a to-do list", + "en": "Set To-do", "ko": "업무 설정", "ja": "未処理にする", "de": "Ich komme zurecht.", @@ -13826,4 +13826,4 @@ "fr": "La nuit", "id": "Tengah malam." } -] \ No newline at end of file +] diff --git a/public/css/fonts/taskfont/iconfont.ttf b/public/css/fonts/taskfont/iconfont.ttf index 1f80b9b6a..4234d2c8b 100644 Binary files a/public/css/fonts/taskfont/iconfont.ttf and b/public/css/fonts/taskfont/iconfont.ttf differ diff --git a/public/css/fonts/taskfont/iconfont.woff b/public/css/fonts/taskfont/iconfont.woff index f4e782446..a88e1dd4b 100644 Binary files a/public/css/fonts/taskfont/iconfont.woff and b/public/css/fonts/taskfont/iconfont.woff differ diff --git a/public/css/fonts/taskfont/iconfont.woff2 b/public/css/fonts/taskfont/iconfont.woff2 index 192ba3adf..004b8695b 100644 Binary files a/public/css/fonts/taskfont/iconfont.woff2 and b/public/css/fonts/taskfont/iconfont.woff2 differ