From 37a0d8ddca99bf5c3239d1ecd616b0b9b73a3d09 Mon Sep 17 00:00:00 2001 From: wxx <1321839169@qq.com> Date: 星期四, 21 十一月 2024 15:25:18 +0800 Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/烛龙AI_1111_07.17 --- Client/王琨元/log/日志模板_王琨元_1118.doc | 0 git - 快捷方式.lnk | 0 zhulongAI.sql | 8 ++++---- Client/陈楚丹/log/日志_陈楚丹_1116.doc | 0 数据库表.docx | 0 Client/宋昊昳/log/日志_宋昊昳_1118.doc | 0 Client/刘子航/document/总结.docx | 0 Client/王琨元/log/日志模板_王琨元_1119.doc | 0 Client/黎弘霖/log/摄像头标注管理_黎弘霖_1117.doc | 0 Server/申烜/log/日志封装_1118.doc | 0 10 files changed, 4 insertions(+), 4 deletions(-) diff --git "a/Client/\345\210\230\345\255\220\350\210\252/document/\346\200\273\347\273\223.docx" "b/Client/\345\210\230\345\255\220\350\210\252/document/\346\200\273\347\273\223.docx" new file mode 100644 index 0000000..176ef50 --- /dev/null +++ "b/Client/\345\210\230\345\255\220\350\210\252/document/\346\200\273\347\273\223.docx" Binary files differ diff --git "a/Client/\345\256\213\346\230\212\346\230\263/log/\346\227\245\345\277\227_\345\256\213\346\230\212\346\230\263_1118.doc" "b/Client/\345\256\213\346\230\212\346\230\263/log/\346\227\245\345\277\227_\345\256\213\346\230\212\346\230\263_1118.doc" new file mode 100644 index 0000000..f11c274 --- /dev/null +++ "b/Client/\345\256\213\346\230\212\346\230\263/log/\346\227\245\345\277\227_\345\256\213\346\230\212\346\230\263_1118.doc" Binary files differ diff --git "a/Client/\347\216\213\347\220\250\345\205\203/log/\346\227\245\345\277\227\346\250\241\346\235\277_\347\216\213\347\220\250\345\205\203_1118.doc" "b/Client/\347\216\213\347\220\250\345\205\203/log/\346\227\245\345\277\227\346\250\241\346\235\277_\347\216\213\347\220\250\345\205\203_1118.doc" new file mode 100644 index 0000000..a10dbfe --- /dev/null +++ "b/Client/\347\216\213\347\220\250\345\205\203/log/\346\227\245\345\277\227\346\250\241\346\235\277_\347\216\213\347\220\250\345\205\203_1118.doc" Binary files differ diff --git "a/Client/\347\216\213\347\220\250\345\205\203/log/\346\227\245\345\277\227\346\250\241\346\235\277_\347\216\213\347\220\250\345\205\203_1119.doc" "b/Client/\347\216\213\347\220\250\345\205\203/log/\346\227\245\345\277\227\346\250\241\346\235\277_\347\216\213\347\220\250\345\205\203_1119.doc" new file mode 100644 index 0000000..f1d2a2b --- /dev/null +++ "b/Client/\347\216\213\347\220\250\345\205\203/log/\346\227\245\345\277\227\346\250\241\346\235\277_\347\216\213\347\220\250\345\205\203_1119.doc" Binary files differ diff --git "a/Client/\351\231\210\346\245\232\344\270\271/log/\346\227\245\345\277\227_\351\231\210\346\245\232\344\270\271_1116.doc" "b/Client/\351\231\210\346\245\232\344\270\271/log/\346\227\245\345\277\227_\351\231\210\346\245\232\344\270\271_1116.doc" new file mode 100644 index 0000000..71f1013 --- /dev/null +++ "b/Client/\351\231\210\346\245\232\344\270\271/log/\346\227\245\345\277\227_\351\231\210\346\245\232\344\270\271_1116.doc" Binary files differ diff --git "a/Client/\351\273\216\345\274\230\351\234\226/log/\346\221\204\345\203\217\345\244\264\346\240\207\346\263\250\347\256\241\347\220\206_\351\273\216\345\274\230\351\234\226_1117.doc" "b/Client/\351\273\216\345\274\230\351\234\226/log/\346\221\204\345\203\217\345\244\264\346\240\207\346\263\250\347\256\241\347\220\206_\351\273\216\345\274\230\351\234\226_1117.doc" new file mode 100644 index 0000000..5721a38 --- /dev/null +++ "b/Client/\351\273\216\345\274\230\351\234\226/log/\346\221\204\345\203\217\345\244\264\346\240\207\346\263\250\347\256\241\347\220\206_\351\273\216\345\274\230\351\234\226_1117.doc" Binary files differ diff --git "a/Server/\347\224\263\347\203\234/log/\346\227\245\345\277\227\345\260\201\350\243\205_1118.doc" "b/Server/\347\224\263\347\203\234/log/\346\227\245\345\277\227\345\260\201\350\243\205_1118.doc" new file mode 100644 index 0000000..7bc4ebc --- /dev/null +++ "b/Server/\347\224\263\347\203\234/log/\346\227\245\345\277\227\345\260\201\350\243\205_1118.doc" Binary files differ diff --git "a/git - \345\277\253\346\215\267\346\226\271\345\274\217.lnk" "b/git - \345\277\253\346\215\267\346\226\271\345\274\217.lnk" new file mode 100644 index 0000000..9d6464d --- /dev/null +++ "b/git - \345\277\253\346\215\267\346\226\271\345\274\217.lnk" Binary files differ diff --git a/zhulongAI.sql b/zhulongAI.sql index f077022..4f41675 100644 --- a/zhulongAI.sql +++ b/zhulongAI.sql @@ -88,12 +88,12 @@ CREATE TABLE IF NOT EXISTS `role_info` ( `id` int NOT NULL AUTO_INCREMENT COMMENT '瑙掕壊琛ㄤ富閿嚜澧瀒d', `permission_type` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '瑙掕壊绫诲瀷', - `query_history` int DEFAULT NULL COMMENT '鍘嗗彶鏌ヨ鍔熻兘', + `per_manage` int DEFAULT NULL COMMENT '鏉冮檺绠＄悊鐣岄潰', `logger_search` int DEFAULT NULL COMMENT '鏃ュ織鏌ヨ鍔熻兘', - `camera_mark` int DEFAULT NULL COMMENT '鎽勫儚澶存爣娉�', - `dev_manage` int DEFAULT NULL COMMENT '鎽勫儚澶磋澶囩鐞�(0,1,2)鍒嗗埆瀵瑰簲鏃犳潈闄愶紝鍙煡鐪嬶紝鍙煡鐪嬩慨鏀�', + `query_history` int DEFAULT NULL COMMENT '鍘嗗彶鍥炴斁鍔熻兘', + `clockin_manage` int DEFAULT NULL COMMENT '鎵撳崱绠＄悊', `image_input` int DEFAULT NULL COMMENT '鍥惧儚褰曞叆绠＄悊', - `version_manage` int DEFAULT NULL COMMENT '鐗堟湰绠＄悊', + `camera_manage` int DEFAULT NULL COMMENT '鎽勫儚澶寸鐞�', `admin` int DEFAULT NULL COMMENT '瓒呯骇绠＄悊鍛�', PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='瑙掕壊鏉冮檺琛�'; diff --git "a/\346\225\260\346\215\256\345\272\223\350\241\250.docx" "b/\346\225\260\346\215\256\345\272\223\350\241\250.docx" index 0d99bb5..b697ff4 100644 --- "a/\346\225\260\346\215\256\345\272\223\350\241\250.docx" +++ "b/\346\225\260\346\215\256\345\272\223\350\241\250.docx" Binary files differ -- Gitblit v1.8.0