kun
|
937c3d5351
|
fix: 合并代码，修改了人员管理中下发状态文本没显示BUG
|
2024-06-15 18:12:11 +08:00 |
|
kun
|
0536100366
|
Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev
|
2024-06-15 18:10:44 +08:00 |
|
kun
|
d948fdbac0
|
fix: 代码合并
|
2024-06-15 18:10:41 +08:00 |
|
|
|
5bcdc09641
|
flx：提交劳务 新增下发状态 未下发文字显示
|
2024-06-15 17:07:48 +08:00 |
|
kun
|
dea1172cdd
|
fix: 人员管理和车辆黑白名单管理添加下发状态筛选
|
2024-06-15 13:48:27 +08:00 |
|
kun
|
153e8d9687
|
fix: 数据校验同步报告以及花名册批量选择功能接口对接
|
2024-06-14 20:34:41 +08:00 |
|
kun
|
dd7ef882b5
|
Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev
|
2024-06-14 20:09:02 +08:00 |
|
kun
|
4441dcaf05
|
fix: 先注释了花名册中的批量的操作以及合并代码
|
2024-06-14 20:08:58 +08:00 |
|
|
|
5741b0bc9d
|
flx：冲突
|
2024-06-14 20:05:18 +08:00 |
|
|
|
e5c001c52e
|
flx：修改人员录入大小限制 盲板抽堵时间
|
2024-06-14 19:27:46 +08:00 |
|
kun
|
4706c346d2
|
fix: 修改数据校验同步报告和花名册中的批量选择
|
2024-06-14 18:56:57 +08:00 |
|
kun
|
c370f12058
|
fix: 合并代码解决冲突
|
2024-06-14 18:56:11 +08:00 |
|
kun
|
940c8674de
|
fix: 修改劳务管理里面的数据校验同步、花名册的页面中的批量选择
|
2024-06-14 18:55:39 +08:00 |
|
|
|
66b1a0d156
|
Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-rain
|
2024-06-14 18:10:26 +08:00 |
|
|
|
5ee8168543
|
flx：修改忘记密码|人员录入页面文字 人员录入限制只能传jpg格式图片
|
2024-06-14 18:05:16 +08:00 |
|
Vce
|
6bedb9267d
|
Merge branch 'bjxz-cjw' into bjxz-dev
|
2024-06-13 23:26:56 +08:00 |
|
Vce
|
9a4868147b
|
fix:修改人员管理系统-人员登记培训-人员入场考试样式
|
2024-06-13 23:26:29 +08:00 |
|
|
|
dc15002725
|
flx:解决冲突
|
2024-06-13 21:52:55 +08:00 |
|
|
|
880072769c
|
flx：修复地址路径
|
2024-06-13 21:51:18 +08:00 |
|
|
|
af0de85991
|
flx：修改劳务人员详情按钮权限
|
2024-06-13 21:17:22 +08:00 |
|
|
|
153fc70d09
|
flx：修改盲板作业的时间
|
2024-06-13 20:30:44 +08:00 |
|
kun
|
072bd482d2
|
fix: 修改头部项目看板的显隐BUG
|
2024-06-13 20:27:06 +08:00 |
|
|
|
1b1e389a80
|
feat：消息推送弹窗延迟
|
2024-06-13 18:43:12 +08:00 |
|
|
|
48441e63d9
|
flx:冲突
|
2024-06-12 21:18:39 +08:00 |
|
|
|
622cddd3fa
|
flx： 冲突
|
2024-06-12 19:32:28 +08:00 |
|
|
|
1a486c4ce4
|
fix：修改劳务数据校验、详情 进度管理按钮权限
|
2024-06-12 19:31:14 +08:00 |
|
kun
|
a031124ef4
|
fix: BUG修改
|
2024-06-12 16:14:55 +08:00 |
|
|
|
d94ff7a334
|
1
|
2024-06-11 21:49:25 +08:00 |
|
|
|
38498c2892
|
flx：冲突
|
2024-06-11 21:48:57 +08:00 |
|
|
|
845870b547
|
1
|
2024-06-11 21:48:11 +08:00 |
|
|
|
27b400978f
|
1
|
2024-06-11 21:43:42 +08:00 |
|
Vce
|
b5725ce706
|
Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev
|
2024-06-11 21:38:33 +08:00 |
|
Vce
|
9e7b3170f8
|
修改bug
|
2024-06-11 21:38:28 +08:00 |
|
|
|
0ecbebdbec
|
1
|
2024-06-11 20:54:58 +08:00 |
|
|
|
e022c6a395
|
修改
|
2024-06-11 20:38:15 +08:00 |
|
|
|
b9014cbafe
|
冲突
|
2024-06-11 19:14:29 +08:00 |
|
|
|
d1085b7e02
|
1
|
2024-06-11 19:13:22 +08:00 |
|
|
|
4b12fc8bee
|
冲突
|
2024-06-11 15:11:51 +08:00 |
|
|
|
a715144ccf
|
1
|
2024-06-11 15:10:11 +08:00 |
|
|
|
10e7f4a991
|
智能安全帽点击打开新窗口问题修复
|
2024-06-11 10:48:46 +08:00 |
|
|
|
8dfb9847c7
|
修改上海张江智能安全帽问题
|
2024-06-09 11:12:27 +08:00 |
|
kun
|
9e4ccfc3f0
|
fix: 解决冲突
|
2024-06-08 15:51:41 +08:00 |
|
kun
|
c09edaf307
|
fix: BUG修改
|
2024-06-08 15:51:10 +08:00 |
|
|
|
7b683e084f
|
提交特殊作业
|
2024-06-08 00:05:22 +08:00 |
|
|
|
442b1f3a42
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-rain
|
2024-06-07 23:55:11 +08:00 |
|
|
|
b9dd0a3fa6
|
1
|
2024-06-07 23:54:37 +08:00 |
|
|
|
1cef553d12
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-rain
|
2024-06-07 23:37:49 +08:00 |
|
|
|
9397237048
|
1
|
2024-06-07 23:36:59 +08:00 |
|
|
|
cfd40a702e
|
1
|
2024-06-07 23:30:59 +08:00 |
|
|
|
efef1eebc8
|
1
|
2024-06-07 21:15:41 +08:00 |
|
