525 Commits

Author SHA1 Message Date
kun
5e6d90d244 fix: BUG修改 2024-05-22 22:04:35 +08:00
kun
a747e0d7c8 Merge branch 'bjxz-cjw' into bjxz-dev 2024-05-22 19:48:50 +08:00
kun
db3245c961 fix: BUG修改 2024-05-22 19:48:09 +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
Vce
eb77b91821 Merge branch 'bjxz-cjw' into bjxz-dev 2024-05-22 01:49:36 +08:00
Vce
b813f2b40e 暂存代码 2024-05-22 01:48:04 +08:00
kun
0f5c68cd04 fix: BUG修改 2024-05-22 01:45:13 +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
a4a17fe060 Merge branch 'bjxz-dev' into bjxz-cjw 2024-05-21 19:13:04 +08:00
Vce
aae7312516 暂存新版考试系统代码 2024-05-21 19:11:51 +08:00
kun
005237eb00 fix: BUG修改 2024-05-21 17:52:00 +08:00
kun
ff079741c7 fix: BUG修改 2024-05-21 01:19:55 +08:00
5e46162345 提交应急 2024-05-21 01:08:11 +08:00
7e3bea6036 flx:提交应急 2024-05-19 19:17:28 +08:00
kun
7cb8caba16 fix: 解决冲突 2024-05-19 19:16:56 +08:00
kun
9671bff95e fix: BUG修改 2024-05-19 19:16:33 +08:00
Vce
bbb89e21f9 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev 2024-05-19 09:14:48 +08:00
Vce
7307607145 添加彭杰远程 2024-05-19 09:14:39 +08:00
kun
21cf0da076 fix: BUG修改 2024-05-18 20:25:29 +08:00
kun
f3d82c92d5 Merge branch 'bjxz-rain' into bjxz-dev 2024-05-18 19:34:36 +08:00
f146ba695b fix: BUG修改 2024-05-18 19:33:11 +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
bc35923e89 修改盲板抽堵作业页面显示异常问题 2024-05-17 07:21:22 +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
a558e50d4c fix: BUG修改 2024-05-15 18:21:20 +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
kun
a1cdeb83d1 fix: BUG修改 2024-05-12 10:06:08 +08:00
kun
b46682e177 fix: 冲突解决 2024-05-12 01:56:48 +08:00
kun
d5710c9f26 fix: BUG修改 2024-05-12 01:56:19 +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