914 Commits

Author SHA1 Message Date
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
af0de85991 flx:修改劳务人员详情按钮权限 2024-06-13 21:17:22 +08:00
153fc70d09 flx:修改盲板作业的时间 2024-06-13 20:30:44 +08:00
1b1e389a80 feat:消息推送弹窗延迟 2024-06-13 18:43:12 +08:00
1a486c4ce4 fix:修改劳务数据校验、详情 进度管理按钮权限 2024-06-12 19:31:14 +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
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
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
b9dd0a3fa6 1 2024-06-07 23:54:37 +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
ba3b1a0a19 1 2024-06-07 21:08:10 +08:00
a04cdb0cb7 提交 2024-06-07 19:58:48 +08:00
440664eec2 1 2024-06-07 19:01:31 +08:00
528ed31e74 提交 2024-06-07 17:45:09 +08:00
f466ae0eab Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-rain 2024-06-07 16:47:14 +08:00
Vce
4c816d4ec5 修改ai预警 2024-06-07 15:54:43 +08:00
65189819a6 提交 2024-06-07 14:09:04 +08:00
Vce
f443e75d50 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev 2024-06-06 23:13:50 +08:00
Vce
d73673fe9a 修改BUG 2024-06-06 23:13:42 +08:00
ed4e73ec8d Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-rain 2024-06-06 18:22:03 +08:00
kun
6636f04ed4 fix: BUG修改 2024-06-06 18:13:40 +08:00
51f98e55e5 修改车辆 和 数据校验 2024-06-06 16:24:18 +08:00
dfe02c0605 1 2024-06-05 22:27:07 +08:00
c3fd0624a5 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-rain 2024-06-05 20:59:01 +08:00
5e35c709af 提交车辆 2024-06-05 20:10:13 +08:00
Vce
b20ea8eb58 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev 2024-06-05 19:32:53 +08:00
Vce
f6c243aed3 限制危大工程数据只能由项目账号和责任人进行操作,而责任单位的其他人只能查看 2024-06-05 19:31:49 +08:00
7a2c3a6dc9 flx:冲突 2024-06-05 16:02:58 +08:00
ce86e2f40a 提交 2024-06-05 16:00:50 +08:00
kun
ca8c5b4352 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev 2024-06-05 15:16:28 +08:00
kun
13c0c5b1d5 fix: BUG修改 2024-06-05 15:16:25 +08:00
Vce
ed4c1e308f Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev 2024-06-05 13:56:44 +08:00
Vce
bd15c67d92 修改传参问题,以及怎加试题内容解析代码功能 2024-06-05 13:54:32 +08:00
kun
fecca362c4 fix: BUG修改 2024-06-05 10:32:38 +08:00
1fdea82f01 提交访客 2024-06-04 22:27:07 +08:00
kun
020b600ad8 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev 2024-06-04 21:30:20 +08:00
kun
37bb04f76b fix: BUG修改 2024-06-04 21:30:17 +08:00
Vce
e2e3ca95d4 Merge branch 'bjxz-cjw' into bjxz-dev 2024-06-04 20:52:54 +08:00