249 Commits

Author SHA1 Message Date
Vce
4c816d4ec5 修改ai预警 2024-06-07 15:54:43 +08:00
kun
fecca362c4 fix: BUG修改 2024-06-05 10:32:38 +08:00
Vce
e2e3ca95d4 Merge branch 'bjxz-cjw' into bjxz-dev 2024-06-04 20:52:54 +08:00
Vce
fd980ef6dd 增加题库导入模板 2024-06-04 20:49:26 +08:00
kun
6ebf7b79ec fix: BUG修改 2024-06-04 18:05:22 +08:00
123a0f16f2 提交劳务 数据校验同步报告 2024-06-03 09:17:20 +08:00
8994bece17 flx:冲突 2024-05-30 20:00:08 +08:00
8641987131 1 2024-05-30 19:59:02 +08:00
kun
b05fc5efb7 fix: BUG修改 2024-05-30 19:58:05 +08:00
kun
81cb377413 fix: BUG修改 2024-05-27 16:46:00 +08:00
kun
42fe9932cf fix: BUG修改 2024-05-24 14:34:59 +08:00
kun
de51bdbf4d Merge branch 'bjxz-rain' into bjxz-dev 2024-05-23 23:38:28 +08:00
kun
3c7d83cd52 Merge branch 'bjxz-cjw' into bjxz-dev 2024-05-23 20:34:04 +08:00
kun
7564b625f8 fix: BUG修改 2024-05-23 20:29:25 +08:00
Vce
af0e9c0c7a 修改bug--新版考试系统 2024-05-23 20:28:46 +08:00
e3547d461e Merge branch 'bjxz-dev' into bjxz-rain 2024-05-22 22:03:08 +08:00
fbbe09eb3c 提交 应急 2024-05-22 20:52:15 +08:00
kun
a747e0d7c8 Merge branch 'bjxz-cjw' into bjxz-dev 2024-05-22 19:48:50 +08:00
Vce
c642a35eae 修改bug 2024-05-22 18:34:36 +08:00
kun
047229b9b2 fix: BUG修改 2024-05-22 15:33:24 +08:00
kun
c5c0cafa83 fix: 解决冲突 2024-05-22 02:13:42 +08:00
kun
68fcd3862d fix: BUG修改 2024-05-22 01:32:10 +08:00
kun
e49b2eaab8 fix: BUG修改 2024-05-22 00:45:31 +08:00
kun
a5c597d808 Merge branch 'bjxz-cjw' into bjxz-dev 2024-05-21 20:23:36 +08:00
kun
410664cf48 fix: BUG修改 2024-05-21 20:18:00 +08:00
Vce
aae7312516 暂存新版考试系统代码 2024-05-21 19:11:51 +08:00
5e46162345 提交应急 2024-05-21 01:08:11 +08:00
7e3bea6036 flx:提交应急 2024-05-19 19:17:28 +08:00
kun
ff3f03897e fix: BUG修改 2024-05-18 18:02:23 +08:00
Vce
156a6c976d Merge branch 'bjxz-rain' into bjxz-dev 2024-05-18 02:22:28 +08:00
Vce
306cc21218 调整特种 2024-05-18 01:47:21 +08:00
kun
cb2e88eb88 fix: BUG修改 2024-05-17 20:14:19 +08:00
Vce
99cd95c490 flx:修改特种作业模块 2024-05-16 18:11:14 +08:00
kun
ec0de14c4f Merge branch 'bjxz-rain' into bjxz-dev 2024-05-15 18:29:40 +08:00
Vce
cb237539b0 flx:新增特种作业 2024-05-15 18:23:40 +08:00
kun
ddecd08a22 Merge branch 'bjxz-rain' into bjxz-dev 2024-05-13 21:24:26 +08:00
Vce
984f248886 flx:安全绩效 2024-05-13 20:48:56 +08:00
Vce
4f73d737b8 添加劳务管理-人员登记培训-删除按钮 2024-05-13 18:42:37 +08:00
Vce
e4e123df8a flx:绑定安全数据 2024-05-13 01:20:59 +08:00
Vce
7ea192fb7c flx:冲突解决 2024-05-12 20:15:21 +08:00
Vce
035a39923e flx:提交教育培训 2024-05-12 20:08:08 +08:00
Vce
6ee44e7690 Merge branch 'bjxz-dev' into bjxz-cjw 2024-05-12 01:39:55 +08:00
Vce
394ac7da93 修改危大工程BUG 2024-05-12 01:39:25 +08:00
kun
8feee43963 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev 2024-05-11 02:53:58 +08:00
kun
a78ff5cd41 fix: BUG修改 2024-05-11 02:53:54 +08:00
Vce
7ce3bd7715 危大工程 2024-05-11 02:49:01 +08:00
Vce
8b527e989b 暂存危大工程 2024-05-10 20:14:59 +08:00
kun
77358756d7 fix: BUG修改 2024-05-09 16:42:40 +08:00
kun
0fb5bf5f69 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev 2024-05-09 00:45:45 +08:00
kun
85edc52a98 fix: BUG修改 2024-05-09 00:45:41 +08:00